Michael Niedermayer 7a02527b05 Merge remote-tracking branch 'qatar/master' ... * qatar/master: ac3enc: use correct alignment and length in channel coupling dsp functions. ffmpeg: don't abuse a global for passing framerate from input to output ffmpeg: don't abuse a global for passing channels from input to output ffmpeg: don't abuse a global for passing samplerate from input to output ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes swscale: use SwsContext for av_log when available swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled. swscale: Fix compilation with --disable-mmx2. Conflicts: ffmpeg.c libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-06-16 03:53:58 +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-10 04:47:23 +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