]> git.sesse.net Git - ffmpeg/commit
Merge commit '8db00081a37d5b7e23918ee500bb16bc59b57197'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 11:42:51 +0000 (13:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Apr 2013 11:42:51 +0000 (13:42 +0200)
commitd0aa60da10229d79aaa087d47dff92fc7518f1e8
treeeb4893099931aa307c9fc4c9d7fb397292972eed
parent3fee9fa0223263d0bcc1eb108a9499180705d3be
parent8db00081a37d5b7e23918ee500bb16bc59b57197
Merge commit '8db00081a37d5b7e23918ee500bb16bc59b57197'

* commit '8db00081a37d5b7e23918ee500bb16bc59b57197':
  x86: hpeldsp: Move half-pel assembly from dsputil to hpeldsp

Conflicts:
libavcodec/hpeldsp.c
libavcodec/hpeldsp.h
libavcodec/x86/Makefile
libavcodec/x86/dsputil_mmx.c
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/hpeldsp_rnd_template.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/hpeldsp.c
libavcodec/x86/Makefile
libavcodec/x86/fpel.asm
libavcodec/x86/hpeldsp_init.c
libavcodec/x86/qpel.asm