diff options
author | Måns Rullgård <mans@mansr.com> | 2010-06-03 02:07:54 +0400 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2010-06-03 02:07:54 +0400 |
commit | 30d87675f152094173fa72f04ca25bab264cdb98 (patch) | |
tree | 4b177a021b389fceff897e368d9300cf6b7f63e6 /libavcodec/arm | |
parent | 68dacb4e3b19772334b1ebcee3b7ac9560922f80 (diff) |
ARM: remove some unnecessary ifdefs, fix implicit declaration warnings
Originally committed as revision 23437 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/arm')
-rw-r--r-- | libavcodec/arm/h264dsp_init_arm.c | 2 | ||||
-rw-r--r-- | libavcodec/arm/h264pred_init_arm.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/libavcodec/arm/h264dsp_init_arm.c b/libavcodec/arm/h264dsp_init_arm.c index c06c3d0c3d..3955d2c096 100644 --- a/libavcodec/arm/h264dsp_init_arm.c +++ b/libavcodec/arm/h264dsp_init_arm.c @@ -86,7 +86,6 @@ void ff_h264_idct_add8_neon(uint8_t **dest, const int *block_offset, DCTELEM *block, int stride, const uint8_t nnzc[6*8]); -#if HAVE_NEON static void ff_h264dsp_init_neon(H264DSPContext *c) { c->h264_v_loop_filter_luma = ff_h264_v_loop_filter_luma_neon; @@ -118,7 +117,6 @@ static void ff_h264dsp_init_neon(H264DSPContext *c) c->h264_idct_add16intra = ff_h264_idct_add16intra_neon; c->h264_idct_add8 = ff_h264_idct_add8_neon; } -#endif void ff_h264dsp_init_arm(H264DSPContext *c) { diff --git a/libavcodec/arm/h264pred_init_arm.c b/libavcodec/arm/h264pred_init_arm.c index a7d9960129..a56759a8cf 100644 --- a/libavcodec/arm/h264pred_init_arm.c +++ b/libavcodec/arm/h264pred_init_arm.c @@ -42,7 +42,6 @@ void ff_pred8x8_0lt_dc_neon(uint8_t *src, int stride); void ff_pred8x8_l00_dc_neon(uint8_t *src, int stride); void ff_pred8x8_0l0_dc_neon(uint8_t *src, int stride); -#if HAVE_NEON static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id) { h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon; @@ -68,7 +67,6 @@ static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id) if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40) h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon; } -#endif void ff_h264_pred_init_arm(H264PredContext *h, int codec_id) { |