
* commit 'f61bece684d9685b07895508e6c1c733b5564ccf': ppc: Add and use convenience macro to check for AltiVec availability Conflicts: libavcodec/ppc/dsputil_ppc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit 'f61bece684d9685b07895508e6c1c733b5564ccf': ppc: Add and use convenience macro to check for AltiVec availability Conflicts: libavcodec/ppc/dsputil_ppc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>