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
..
bfin
mlib
ppc	Merge remote-tracking branch 'qatar/master'	2012-01-05 02:03:12 +01:00
sparc
x86	Merge remote-tracking branch 'qatar/master'	2012-01-05 02:03:12 +01:00
colorspace-test.c	Merge remote-tracking branch 'qatar/master'	2012-01-03 03:06:45 +01:00
libswscale.v
Makefile	Merge remote-tracking branch 'qatar/master'	2012-01-05 02:03:12 +01:00
options.c
rgb2rgb_template.c	Use more accurate conversion for rgb15/16 to rgb24/32 (C/MMX).	2011-11-09 01:58:22 +01:00
rgb2rgb.c	Merge remote-tracking branch 'qatar/master'	2011-12-12 01:25:37 +01:00
rgb2rgb.h
swscale_internal.h	Merge remote-tracking branch 'qatar/master'	2011-12-23 03:25:51 +01:00
swscale_unscaled.c	Merge remote-tracking branch 'qatar/master'	2011-12-27 01:19:18 +01:00
swscale-test.c	sws: update copyright dates	2011-11-18 21:44:26 +01:00
swscale.c	Merge remote-tracking branch 'qatar/master'	2012-01-06 02:45:12 +01:00
swscale.h	libswscale: increase LIBSWSCALE_VERSION_MICRO to 100	2011-12-22 03:07:57 +01:00
utils.c	swscale: don't show full-chroma-int warning for non-RGB output.	2012-01-03 20:01:21 -08:00
yuv2rgb.c	sws: Fix warning: ‘abase’ may be used uninitialized in this function	2011-11-18 21:51:29 +01:00