diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 14:11:10 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-20 14:19:08 +0200 |
commit | c4010972c4a7bd1f5f38cf8a75faf7a57da10ee9 (patch) | |
tree | f162756b8a21ef9f09fdd9b569364474caca4181 /libavcodec/arm/hpeldsp_init_arm.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/arm/hpeldsp_init_arm.c')
-rw-r--r-- | libavcodec/arm/hpeldsp_init_arm.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libavcodec/arm/hpeldsp_init_arm.c b/libavcodec/arm/hpeldsp_init_arm.c index bae93eb3cd..2cc2b782b2 100644 --- a/libavcodec/arm/hpeldsp_init_arm.c +++ b/libavcodec/arm/hpeldsp_init_arm.c @@ -20,7 +20,9 @@ */ #include "libavutil/arm/cpu.h" +#include "libavutil/attributes.h" #include "libavcodec/bit_depth_template.c" // for CALL_2X_PIXELS +#include "libavcodec/rnd_avg.h" #include "hpeldsp_arm.h" void ff_put_pixels8_arm(uint8_t *block, const uint8_t *pixels, ptrdiff_t line_size, int h); @@ -41,7 +43,7 @@ CALL_2X_PIXELS(ff_put_no_rnd_pixels16_x2_arm, ff_put_no_rnd_pixels8_x2_arm, 8) CALL_2X_PIXELS(ff_put_no_rnd_pixels16_y2_arm, ff_put_no_rnd_pixels8_y2_arm, 8) CALL_2X_PIXELS(ff_put_no_rnd_pixels16_xy2_arm, ff_put_no_rnd_pixels8_xy2_arm,8) -void ff_hpeldsp_init_arm(HpelDSPContext* c, int flags) +av_cold void ff_hpeldsp_init_arm(HpelDSPContext *c, int flags) { int cpu_flags = av_get_cpu_flags(); @@ -63,6 +65,8 @@ void ff_hpeldsp_init_arm(HpelDSPContext* c, int flags) c->put_no_rnd_pixels_tab[1][2] = ff_put_no_rnd_pixels8_y2_arm; c->put_no_rnd_pixels_tab[1][3] = ff_put_no_rnd_pixels8_xy2_arm; - if (have_armv6(cpu_flags)) ff_hpeldsp_init_armv6(c, flags); - if (have_neon(cpu_flags)) ff_hpeldsp_init_neon(c, flags); + if (have_armv6(cpu_flags)) + ff_hpeldsp_init_armv6(c, flags); + if (have_neon(cpu_flags)) + ff_hpeldsp_init_neon(c, flags); } |