* commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6': ppc: idctdsp: Immediately return if no AltiVec is available Conflicts: libavcodec/ppc/idctdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* commit '03c9f357a4c2307a7913cea2cbf0ba817e80beb6': ppc: idctdsp: Immediately return if no AltiVec is available Conflicts: libavcodec/ppc/idctdsp.c Merged-by: Michael Niedermayer <michaelni@gmx.at>