ARM: remove some unnecessary ifdefs, fix implicit declaration warnings

Originally committed as revision 23437 to svn://svn.ffmpeg.org/ffmpeg/trunk
oldabi
Måns Rullgård 15 years ago
parent 68dacb4e3b
commit 30d87675f1
  1. 2
      libavcodec/arm/h264dsp_init_arm.c
  2. 2
      libavcodec/arm/h264pred_init_arm.c

@ -86,7 +86,6 @@ void ff_h264_idct_add8_neon(uint8_t **dest, const int *block_offset,
DCTELEM *block, int stride, DCTELEM *block, int stride,
const uint8_t nnzc[6*8]); const uint8_t nnzc[6*8]);
#if HAVE_NEON
static void ff_h264dsp_init_neon(H264DSPContext *c) static void ff_h264dsp_init_neon(H264DSPContext *c)
{ {
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;
@ -118,7 +117,6 @@ static void ff_h264dsp_init_neon(H264DSPContext *c)
c->h264_idct_add16intra = ff_h264_idct_add16intra_neon; c->h264_idct_add16intra = ff_h264_idct_add16intra_neon;
c->h264_idct_add8 = ff_h264_idct_add8_neon; c->h264_idct_add8 = ff_h264_idct_add8_neon;
} }
#endif
void ff_h264dsp_init_arm(H264DSPContext *c) void ff_h264dsp_init_arm(H264DSPContext *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_l00_dc_neon(uint8_t *src, int stride);
void ff_pred8x8_0l0_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) static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id)
{ {
h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon; 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) if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40)
h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon; h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon;
} }
#endif
void ff_h264_pred_init_arm(H264PredContext *h, int codec_id) void ff_h264_pred_init_arm(H264PredContext *h, int codec_id)
{ {

Loading…
Cancel
Save