diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:11:10 +0400 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 16:19:08 +0400 |
| commit | c4010972c4a7bd1f5f38cf8a75faf7a57da10ee9 (patch) | |
| tree | f162756b8a21ef9f09fdd9b569364474caca4181 /libavcodec/hpeldsp.c | |
| parent | 055e5c8e01c57783207861c96a5affbcd9e40160 (diff) | |
| parent | 7384b7a71338d960e421d6dc3d77da09b0a442cb (diff) | |
Merge commit '7384b7a71338d960e421d6dc3d77da09b0a442cb'
* commit '7384b7a71338d960e421d6dc3d77da09b0a442cb':
arm: hpeldsp: Move half-pel assembly from dsputil to hpeldsp
Conflicts:
libavcodec/arm/Makefile
libavcodec/arm/hpeldsp_arm.S
libavcodec/arm/hpeldsp_arm.h
libavcodec/arm/hpeldsp_armv6.S
libavcodec/arm/hpeldsp_init_arm.c
libavcodec/arm/hpeldsp_init_armv6.c
libavcodec/arm/hpeldsp_init_neon.c
libavcodec/arm/hpeldsp_neon.S
libavcodec/hpeldsp.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/hpeldsp.c')
| -rw-r--r-- | libavcodec/hpeldsp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/hpeldsp.c b/libavcodec/hpeldsp.c index 2c2d298cd2..a01b322e87 100644 --- a/libavcodec/hpeldsp.c +++ b/libavcodec/hpeldsp.c @@ -54,14 +54,14 @@ av_cold void ff_hpeldsp_init(HpelDSPContext *c, int flags) hpel_funcs(avg, [3], 2); hpel_funcs(avg_no_rnd,, 16); + if (ARCH_ARM) + ff_hpeldsp_init_arm(c, flags); if (ARCH_PPC) ff_hpeldsp_init_ppc(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); - if (ARCH_PPC) ff_hpeldsp_init_ppc (c, flags); if (ARCH_SH4) ff_hpeldsp_init_sh4 (c, flags); if (ARCH_BFIN) ff_hpeldsp_init_bfin (c, flags); } |