Merge commit '2957d29f'
* commit '2957d29f': alpha: hpeldsp: Move half-pel assembly from dsputil to hpeldsp Conflicts: libavcodec/alpha/dsputil_alpha.c libavcodec/alpha/hpeldsp_alpha.c libavcodec/alpha/hpeldsp_alpha.h libavcodec/alpha/hpeldsp_alpha_asm.S libavcodec/hpeldsp.h Merged-by:Michael Niedermayer <michaelni@gmx.at>
Showing
Please register or sign in to comment