diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 13:42:51 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 13:42:51 +0200 |
| commit | d0aa60da10229d79aaa087d47dff92fc7518f1e8 (patch) | |
| tree | eb4893099931aa307c9fc4c9d7fb397292972eed /libavcodec/hpeldsp.c | |
| parent | 3fee9fa0223263d0bcc1eb108a9499180705d3be (diff) | |
| parent | 8db00081a37d5b7e23918ee500bb16bc59b57197 (diff) | |
| download | ffmpeg-d0aa60da10229d79aaa087d47dff92fc7518f1e8.tar.gz | |
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>
Diffstat (limited to 'libavcodec/hpeldsp.c')
| -rw-r--r-- | libavcodec/hpeldsp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/hpeldsp.c b/libavcodec/hpeldsp.c index bcc7b45d1b..512767492d 100644 --- a/libavcodec/hpeldsp.c +++ b/libavcodec/hpeldsp.c @@ -54,7 +54,8 @@ av_cold void ff_hpeldsp_init(HpelDSPContext *c, int flags) hpel_funcs(avg, [3], 2); hpel_funcs(avg_no_rnd,, 16); - if (ARCH_X86) ff_hpeldsp_init_x86 (c, flags); + if (ARCH_X86) + ff_hpeldsp_init_x86(c, flags); if (ARCH_ARM) ff_hpeldsp_init_arm (c, flags); if (HAVE_VIS) ff_hpeldsp_init_vis (c, flags); if (ARCH_ALPHA) ff_hpeldsp_init_alpha (c, flags); |