Merge commit 'f668afd4896ee65683619b6f165dda4cdd46766f'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Apr 2011 01:46:27 +0000 (03:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 16 Apr 2011 01:46:35 +0000 (03:46 +0200)
commitf6302ad6ee12bd1eeee9fb2d5642290c0ec5bb1b
treecc87818aafd5d2b6399867e63dd0be11fe97de44
parentf4bc923ec1b367ebdbc626da3bc0fa5a57e60910
parentf668afd4896ee65683619b6f165dda4cdd46766f
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@gmx.at>