-
Michael Niedermayer authored
* commit '47e5a981': ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/hpeldsp.h libavcodec/ppc/hpeldsp_altivec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
055e5c8e
* commit '47e5a981': ppc: hpeldsp: Move half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/hpeldsp.h libavcodec/ppc/hpeldsp_altivec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>