* 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> |
14 years ago | |
|---|---|---|
| .. | ||
| rgb2rgb.c | Merge remote-tracking branch 'qatar/master' | 14 years ago |
| rgb2rgb_template.c | Merge remote-tracking branch 'qatar/master' into master | 14 years ago |
| swscale_mmx.c | Merge remote-tracking branch 'qatar/master' | 14 years ago |
| swscale_template.c | Merge remote-tracking branch 'qatar/master' | 14 years ago |
| yuv2rgb_mmx.c | Merge remote-tracking branch 'qatar/master' | 14 years ago |
| yuv2rgb_template.c | In libswscale, use all lines when converting from 422p to rgb with mmx, improve quality. | 14 years ago |