FFmpeg/libavcodec
Michael Niedermayer 9765caec1b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  adpcm: split ADPCM encoders and decoders into separate files.
  doc/avconv: fix typo.
  rv34: check that subsequent slices have the same type as first one.
  smacker demuxer: handle possible av_realloc() failure.
  lavfi: add split filter from soc.
  lavfi: add showinfo filter
  libxavs: add private options corresponding to deprecated global options

Conflicts:
	Changelog
	libavcodec/adpcm.c
	libavfilter/avfilter.h
	libavfilter/vf_showinfo.c
	libavfilter/vf_split.c
	libavformat/smacker.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-12 21:01:12 +02:00
..
2011-08-15 00:39:55 +02:00
2011-06-02 20:06:00 +01:00
2011-08-12 17:20:57 +02:00
2011-09-11 04:07:08 +02:00
2011-05-21 02:31:27 +02:00
2011-09-10 00:26:48 +02:00
2011-05-13 04:40:40 +02:00
2011-05-13 04:40:40 +02:00
2011-06-02 20:06:00 +01:00
2011-08-15 00:39:55 +02:00
2011-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +02:00
2011-09-02 05:21:25 +02:00
2011-08-30 05:41:44 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-08-15 00:39:55 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-07-21 18:10:58 +01:00
2011-09-08 05:34:17 +02:00
2011-09-10 00:26:48 +02:00
2011-09-11 04:07:08 +02:00
2011-09-06 18:20:34 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-24 01:31:53 +02:00
2011-05-21 13:48:10 +02:00
2011-09-07 01:10:14 +02:00
2011-08-09 15:08:20 +02:00
2011-08-01 01:26:55 +02:00
2011-09-07 01:10:14 +02:00
2011-09-10 00:26:48 +02:00
2011-09-07 12:16:15 +02:00
2011-09-11 12:54:47 +02:00
2011-09-01 02:38:56 +02:00
2011-05-13 04:40:40 +02:00
2011-09-10 22:10:00 +02:00
2011-08-15 00:39:55 +02:00
2011-06-21 13:17:10 +02:00