Changeset f6302ad6 in ffmpeg

Timestamp:

Apr 16, 2011, 1:46:35 AM (14 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

d3b379b9

Parents:

f4bc923e (diff), f668afd4 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (04/16/11 01:46:27)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (04/16/11 01:46:35)

Message:

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>

(No files)