]> git.sesse.net Git - ffmpeg/commit
Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 13:24:25 +0000 (15:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 13:24:25 +0000 (15:24 +0200)
commit6ec26157b96b74a26c5148bffbf862920a1afc34
treee42fc16ac43e0ce3d5a03f596b50b4c03caebae6
parentfdb1f7eb7a802eec63a051499110842f3056cf9b
parent2957d29f0531ccd8a6f4378293424dfd92db3044
Merge commit '2957d29f0531ccd8a6f4378293424dfd92db3044'

* commit '2957d29f0531ccd8a6f4378293424dfd92db3044':
  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>
libavcodec/alpha/dsputil_alpha_asm.S
libavcodec/alpha/hpeldsp_alpha.c
libavcodec/alpha/hpeldsp_alpha.h
libavcodec/alpha/hpeldsp_alpha_asm.S
libavcodec/alpha/regdef.h
libavcodec/hpeldsp.h