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
..
fate	H264/MPEG frame-level multi-threading.	2011-06-02 10:16:20 -07:00
ref	swscale: fix JPEG-range YUV scaling artifacts.	2011-06-14 09:46:49 -04:00
audiogen.c
base64.c
codec-regression.sh	Merge remote-tracking branch 'qatar/master'	2011-05-19 06:00:31 +02:00
copy.regression.ref
copycooker.sh
fate2.mak	ffmpeg: don't abuse a global for passing samplerate from input to output	2011-06-15 21:57:52 +02:00
fate-run.sh
fate-update.sh
fate.mak
fate.sh	fate: add comment field	2011-05-20 13:50:52 +01:00
ffserver-regression.sh
ffserver.conf
ffserver.regression.ref
lavf-regression.sh	ffmpeg: don't abuse a global for passing samplerate from input to output	2011-06-15 21:57:52 +02:00
lavfi-regression.sh	Merge remote-tracking branch 'qatar/master'	2011-05-19 06:00:31 +02:00
lena.pnm
md5.sh
regression-funcs.sh	ffmpeg: don't abuse a global for passing samplerate from input to output	2011-06-15 21:57:52 +02:00
rotozoom.c	Merge remote branch 'qatar/master'	2011-05-12 04:51:24 +02:00
seek_test.c
tiny_psnr.c
videogen.c