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
..
bfin
mlib
ppc	Merge remote-tracking branch 'qatar/master'	2012-01-10 03:50:41 +01:00
sparc
x86	Merge remote-tracking branch 'qatar/master'	2012-01-15 01:16:54 +01:00
colorspace-test.c	Merge remote-tracking branch 'qatar/master'	2012-01-10 03:50:41 +01:00
libswscale.v
Makefile	Merge remote-tracking branch 'qatar/master'	2012-01-10 03:50:41 +01:00
options.c	Merge remote-tracking branch 'qatar/master'	2011-10-13 06:00:03 +02:00
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'	2012-01-14 02:22:09 +01:00
rgb2rgb.h	Merge remote-tracking branch 'qatar/master'	2012-01-14 02:22:09 +01:00
swscale_internal.h	sws: Move yuv2rgb clipping into the tables.	2012-01-11 15:04:02 +01:00
swscale_unscaled.c	Merge remote-tracking branch 'qatar/master'	2012-01-14 02:22:09 +01:00
swscale-test.c	Merge remote-tracking branch 'qatar/master'	2012-01-14 02:22:09 +01:00
swscale.c	sws: Remove unneeded YUV cliping from yuv2rgb_X_c_template()	2012-01-11 21:29:59 +01:00
swscale.h	Merge remote-tracking branch 'qatar/master'	2012-01-10 03:50:41 +01:00
utils.c	Merge remote-tracking branch 'qatar/master'	2012-01-15 01:16:54 +01:00
yuv2rgb.c	sws: Move yuv2rgb clipping into the tables.	2012-01-11 15:04:02 +01:00