From 30d87675f152094173fa72f04ca25bab264cdb98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Rullg=C3=A5rd?= Date: Wed, 2 Jun 2010 22:07:54 +0000 Subject: [PATCH] ARM: remove some unnecessary ifdefs, fix implicit declaration warnings Originally committed as revision 23437 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/arm/h264dsp_init_arm.c | 2 -- libavcodec/arm/h264pred_init_arm.c | 2 -- 2 files changed, 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) {