From: Michael Niedermayer Date: Sat, 16 Apr 2011 01:46:27 +0000 (+0200) Subject: Merge commit 'f668afd4896ee65683619b6f165dda4cdd46766f' X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=f6302ad6ee12bd1eeee9fb2d5642290c0ec5bb1b;p=ffmpeg Merge commit 'f668afd4896ee65683619b6f165dda4cdd46766f' * commit 'f668afd4896ee65683619b6f165dda4cdd46766f': swscale: fix "ISO C90 forbids mixed declarations and code" warning swscale: fix compilation with --enable-runtime-cpudetect swscale: correct include path to fix ppc altivec build swscale: simplify rgb2rgb templating swscale: simplify initialization code swscale: further cleanup swscale.c swscale: partially move the arch specific code left swscale: move away x86 specific code from rgb2rgb None of above is merged, the changes are not yet ready they add over 2000 lines of duplicated code and a few bugs Merged-by: Michael Niedermayer --- f6302ad6ee12bd1eeee9fb2d5642290c0ec5bb1b