Michael Niedermayer 4640da7e58 Merge remote-tracking branch 'qatar/master' ... * qatar/master: sgidec: Use bytestream2 functions to prevent buffer overreads. cosmetics: Move static and inline attributes to more standard places. configure: provide libavfilter/version.h header to get_version() swscale: change yuv2yuvX code to use cpuflag(). libx264: Don't leave max_b_frames as -1 if the user didn't set it FATE: convert output to rgba for the targa tests which currently output pal8 fate: add missing reference files for targa tests in 9c2f9b0e2 FATE: enable the 2 remaining targa conformance suite tests targa: add support for rgb555 palette FATE: fix targa tests on big-endian systems Conflicts: libavcodec/sgidec.c libavcodec/targa.c libswscale/x86/output.asm tests/fate/image.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-01-15 01:16:54 +01:00
..
acodec	Merge remote-tracking branch 'qatar/master'	2012-01-11 02:44:43 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2012-01-15 01:16:54 +01:00
lavf	Merge remote-tracking branch 'qatar/master'	2012-01-11 02:44:43 +01:00
lavfi	Merge remote-tracking branch 'qatar/master'	2012-01-10 03:50:41 +01:00
seek	mxfdec: Hybrid demuxing/seeking solution	2011-12-16 11:54:03 +01:00
vsynth1	Merge remote-tracking branch 'qatar/master'	2012-01-11 02:44:43 +01:00
vsynth2	Merge remote-tracking branch 'qatar/master'	2012-01-11 02:44:43 +01:00