Michael Niedermayer 3edff185ab Merge remote-tracking branch 'qatar/master' ... * qatar/master: (21 commits) ipmovie: do not read audio packets before the codec is known truemotion2: check size before GetBitContext initialisation avio: Only do implicit network initialization for network protocols avio: Add an URLProtocol flag for indicating that a protocol uses network adpcm: ADPCM Electronic Arts has always two channels matroskadec: Fix a bug where a pointer was cached to an array that might later move due to a realloc() fate: Add missing reference file from 9b4767e4. mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions. 4xm: Prevent buffer overreads. mjpegdec: parse RSTn to prevent skipping other data in mjpeg_decode_scan vp3: add fate test for non-zero last coefficient vp3: fix streams with non-zero last coefficient swscale: remove unused U/V arguments from yuv2rgb_write(). timer: K&R formatting cosmetics lavf: cosmetics, reformat av_read_frame(). lavf: refactor av_read_frame() to make it easier to understand. Report an error if pitch_lag is zero in AMR-NB decoder. Revert "4xm: Prevent buffer overreads." 4xm: Prevent buffer overreads. 4xm: pass the correct remaining buffer size to decode_i2_frame(). ... Conflicts: libavcodec/4xm.c libavcodec/mjpegdec.c libavcodec/truemotion2.c libavformat/ipmovie.c libavformat/mov_chan.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-01-06 02:45:12 +01:00
..
acodec	Merge remote-tracking branch 'qatar/master'	2012-01-05 02:03:12 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2012-01-06 02:45:12 +01:00
lavf	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
lavfi	Merge remote-tracking branch 'qatar/master'	2011-12-21 03:40:53 +01:00
seek	mxfdec: Hybrid demuxing/seeking solution	2011-12-16 11:54:03 +01:00
vsynth1	cljrdec: improve scaling somewhat	2011-12-28 22:05:24 +01:00
vsynth2	cljrdec: improve scaling somewhat	2011-12-28 22:05:24 +01:00