Commit 7febc5aa authored by Michael Niedermayer's avatar Michael Niedermayer

arm: fix compile with disable-optimizations on android

Fixes Ticket1241
Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent cf753d5b
...@@ -70,6 +70,7 @@ void ff_h264_idct8_add4_neon(uint8_t *dst, const int *block_offset, ...@@ -70,6 +70,7 @@ void ff_h264_idct8_add4_neon(uint8_t *dst, const int *block_offset,
static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
{ {
#if HAVE_NEON
if (bit_depth == 8) { if (bit_depth == 8) {
c->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_neon; c->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_neon;
c->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_neon; c->h264_h_loop_filter_luma = ff_h264_h_loop_filter_luma_neon;
...@@ -96,6 +97,7 @@ static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const i ...@@ -96,6 +97,7 @@ static void ff_h264dsp_init_neon(H264DSPContext *c, const int bit_depth, const i
c->h264_idct8_dc_add = ff_h264_idct8_dc_add_neon; c->h264_idct8_dc_add = ff_h264_idct8_dc_add_neon;
c->h264_idct8_add4 = ff_h264_idct8_add4_neon; c->h264_idct8_add4 = ff_h264_idct8_add4_neon;
} }
#endif // HAVE_NEON
} }
void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc) void ff_h264dsp_init_arm(H264DSPContext *c, const int bit_depth, const int chroma_format_idc)
......
...@@ -45,6 +45,7 @@ void ff_pred8x8_0l0_dc_neon(uint8_t *src, int stride); ...@@ -45,6 +45,7 @@ void ff_pred8x8_0l0_dc_neon(uint8_t *src, int stride);
static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc) static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int bit_depth, const int chroma_format_idc)
{ {
#if HAVE_NEON
const int high_depth = bit_depth > 8; const int high_depth = bit_depth > 8;
if (high_depth) if (high_depth)
...@@ -74,6 +75,7 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int b ...@@ -74,6 +75,7 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id, const int b
h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon; h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon;
if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8) if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8)
h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon; h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon;
#endif // HAVE_NEON
} }
void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, int bit_depth, const int chroma_format_idc) void ff_h264_pred_init_arm(H264PredContext *h, int codec_id, int bit_depth, const int chroma_format_idc)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment