* commit '38282149b6ce8f4b8361e3b84542ba9aa8a1f32f': ppc: More consistent arch initialization Conflicts: libavcodec/fft.h libavcodec/mpegaudiodsp.c libavcodec/mpegaudiodsp.h Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '6b110d3a739c31602b59887ad65c67025df3f49d': ppc: More consistent names for H.264 optimizations files mpegaudiosp: More consistent names for ppc/x86 optimization files Merged-by: Michael Niedermayer <michaelni@gmx.at>