diff options
| author | Michael Niedermayer <[email protected]> | 2013-04-20 13:42:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2013-04-20 13:42:51 +0200 |
| commit | d0aa60da10229d79aaa087d47dff92fc7518f1e8 (patch) | |
| tree | eb4893099931aa307c9fc4c9d7fb397292972eed /libavfilter/libmpcodecs/mpbswap.h | |
| parent | 3fee9fa0223263d0bcc1eb108a9499180705d3be (diff) | |
| parent | 8db00081a37d5b7e23918ee500bb16bc59b57197 (diff) | |
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 <[email protected]>
Diffstat (limited to 'libavfilter/libmpcodecs/mpbswap.h')
0 files changed, 0 insertions, 0 deletions