* commit '5dcc201505f71b1e73e9eef12ce89d4eed252ad0': simple_idct: Move x86-specific declarations to a header in the x86 directory Conflicts: libavcodec/x86/simple_idct.c Merged-by: Michael Niedermayer <michaelni@gmx.at>