[FFmpeg-cvslog] Merge commit 'f668afd4896ee65683619b6f165dda4cdd46766f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Apr 16 03:46:27 2011 +0200| [f6302ad6ee12bd1eeee9fb2d5642290c0ec5bb1b] | committer: Michael Niedermayer

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 <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f6302ad6ee12bd1eeee9fb2d5642290c0ec5bb1b
---