
* commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78': ppc: dsputil: Coalesce all init files Conflicts: libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'a8552ee3eb335d2fd2d6c99363367a6090298f78': ppc: dsputil: Coalesce all init files Conflicts: libavcodec/ppc/dsputil_altivec.h libavcodec/ppc/dsputil_ppc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>