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
..
fate	Merge remote-tracking branch 'qatar/master'	2012-01-06 02:45:12 +01:00
ref	Merge remote-tracking branch 'qatar/master'	2012-01-06 02:45:12 +01:00
Makefile	Merge remote-tracking branch 'qatar/master'	2012-01-01 00:07:31 +01:00
audiogen.c	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00
base64.c	…
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	2012-01-05 02:03:12 +01:00
copycooker.sh	…
fate-run.sh	fate: give stderr hint when a test fails.	2011-12-26 22:27:01 +01:00
fate-update.sh	…
fate.sh	…
fate_config.sh.template	tests: add a FATE configuration template	2011-11-24 00:33:20 +01:00
ffserver-regression.sh	…
ffserver.conf	…
ffserver.regression.ref	…
lavf-regression.sh	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
lavfi-regression.sh	…
lena.pnm	…
md5.sh	…
regression-funcs.sh	Run zmbv regression without md5sum.	2011-12-10 19:34:28 +01:00
rotozoom.c	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00
tiny_psnr.c	…
videogen.c	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00