ffmpeg/libswscale/x86
Michael Niedermayer f211d9d839 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  build: improve rules for test programs
  build: factor out the .c and .S compile commands as a macro
  swscale: remove unused xInc/srcW arguments from hScale().
  H.264: disable 2tap qpel with CODEC_FLAG2_FAST and >8-bit
  H.264: make filter_mb_fast support 4:4:4
  mpeg4videoenc: Remove disabled variant of mpeg4_encode_block().
  configure: allow post-fixed cpu strings for athlon64, k8, and opteron when setting the -march flag.
  Move some variable declarations below the proper #ifdefs.

Conflicts:
	Makefile
	ffplay.c
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-27 03:32:45 +02:00
..
rgb2rgb.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
rgb2rgb_template.c Merge remote-tracking branch 'qatar/master' into master 2011-05-29 03:34:35 +02:00
swscale_mmx.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
swscale_template.c Merge remote-tracking branch 'qatar/master' 2011-06-27 03:32:45 +02:00
yuv2rgb_mmx.c Merge remote-tracking branch 'qatar/master' 2011-06-16 03:53:58 +02:00
yuv2rgb_template.c In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality. 2011-06-03 03:46:13 +02:00