diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 13:26:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-07 13:31:40 +0200 |
| commit | 7febc5aa93c16cfdeda603950af5c76e087c7b56 (patch) | |
| tree | 63532b63cdd2b004a3f29fdf49f51c41b883f2a9 | |
| parent | cf753d5b598c9618e296fca084a17f035b0db382 (diff) | |
| download | ffmpeg-7febc5aa93c16cfdeda603950af5c76e087c7b56.tar.gz | |
arm: fix compile with disable-optimizations on android
Fixes Ticket1241
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/arm/h264dsp_init_arm.c | 2 | ||||
| -rw-r--r-- | libavcodec/arm/h264pred_init_arm.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index 367ba8134b..f150a4508d 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -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) { +#if HAVE_NEON if (bit_depth == 8) { 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; @@ -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_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) diff --git a/libavcodec/arm/h264pred_init_arm.c b/libavcodec/arm/h264pred_init_arm.c index 13aea3212f..fd2cdc0838 100644 --- a/libavcodec/arm/h264pred_init_arm.c +++ b/libavcodec/arm/h264pred_init_arm.c @@ -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) { +#if HAVE_NEON const int high_depth = bit_depth > 8; if (high_depth) @@ -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; if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40 && codec_id != CODEC_ID_VP8) 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) |