diff options
| author | James Almer <jamrial@gmail.com> | 2015-03-12 15:35:05 -0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-13 13:04:32 +0100 |
| commit | 742bc7eea84a1cfb804f0e92f202dbe9d653f930 (patch) | |
| tree | 3e3f8de9b1374ce32398147fc308046dd984a81b /libavcodec/arm/hevcdsp_init_neon.c | |
| parent | c58edf52f9c57e14887b1f56a0543bebe20360c3 (diff) | |
| download | ffmpeg-742bc7eea84a1cfb804f0e92f202dbe9d653f930.tar.gz | |
hevcdsp: fix compilation for arm and aarch64
Also add av_cold to ff_hevcdsp_init_arm.
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit d5addf1555024aebf13b37fbca9fb8d0f4f656ca)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/arm/hevcdsp_init_neon.c')
| -rw-r--r-- | libavcodec/arm/hevcdsp_init_neon.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/libavcodec/arm/hevcdsp_init_neon.c b/libavcodec/arm/hevcdsp_init_neon.c index 61e6462cbd..55918077e2 100644 --- a/libavcodec/arm/hevcdsp_init_neon.c +++ b/libavcodec/arm/hevcdsp_init_neon.c @@ -21,6 +21,7 @@ #include "libavutil/attributes.h" #include "libavutil/arm/cpu.h" #include "libavcodec/hevcdsp.h" +#include "hevcdsp_arm.h" void ff_hevc_v_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); void ff_hevc_h_loop_filter_luma_neon(uint8_t *_pix, ptrdiff_t _stride, int _beta, int *_tc, uint8_t *_no_p, uint8_t *_no_q); @@ -141,9 +142,8 @@ void ff_hevc_put_qpel_bi_neon_wrapper(uint8_t *dst, ptrdiff_t dststride, uint8_t put_hevc_qpel_uw_neon[my][mx](dst, dststride, src, srcstride, width, height, src2, MAX_PB_SIZE); } -static av_cold void hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) +av_cold void ff_hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) { -#if HAVE_NEON if (bit_depth == 8) { int x; c->hevc_v_loop_filter_luma = ff_hevc_v_loop_filter_luma_neon; @@ -221,13 +221,4 @@ static av_cold void hevcdsp_init_neon(HEVCDSPContext *c, const int bit_depth) c->put_hevc_qpel_uni[8][0][0] = ff_hevc_put_qpel_uw_pixels_w48_neon_8; c->put_hevc_qpel_uni[9][0][0] = ff_hevc_put_qpel_uw_pixels_w64_neon_8; } -#endif // HAVE_NEON -} - -void ff_hevcdsp_init_arm(HEVCDSPContext *c, const int bit_depth) -{ - int cpu_flags = av_get_cpu_flags(); - - if (have_neon(cpu_flags)) - hevcdsp_init_neon(c, bit_depth); } |