diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-16 05:46:27 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-16 05:46:35 +0400 |
| commit | f6302ad6ee12bd1eeee9fb2d5642290c0ec5bb1b (patch) | |
| tree | cc87818aafd5d2b6399867e63dd0be11fe97de44 /libavformat/xwma.c | |
| parent | f4bc923ec1b367ebdbc626da3bc0fa5a57e60910 (diff) | |
| parent | f668afd4896ee65683619b6f165dda4cdd46766f (diff) | |
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>
Diffstat (limited to 'libavformat/xwma.c')
0 files changed, 0 insertions, 0 deletions