comparison arm/h264pred_init_arm.c @ 11817:21566c95834c libavcodec

ARM: remove some unnecessary ifdefs, fix implicit declaration warnings
author mru
date Wed, 02 Jun 2010 22:07:54 +0000
parents 8db678424a18
children 823f332655e8
comparison
equal deleted inserted replaced
11816:7c2369ec6faa 11817:21566c95834c
40 void ff_pred8x8_l0t_dc_neon(uint8_t *src, int stride); 40 void ff_pred8x8_l0t_dc_neon(uint8_t *src, int stride);
41 void ff_pred8x8_0lt_dc_neon(uint8_t *src, int stride); 41 void ff_pred8x8_0lt_dc_neon(uint8_t *src, int stride);
42 void ff_pred8x8_l00_dc_neon(uint8_t *src, int stride); 42 void ff_pred8x8_l00_dc_neon(uint8_t *src, int stride);
43 void ff_pred8x8_0l0_dc_neon(uint8_t *src, int stride); 43 void ff_pred8x8_0l0_dc_neon(uint8_t *src, int stride);
44 44
45 #if HAVE_NEON
46 static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id) 45 static void ff_h264_pred_init_neon(H264PredContext *h, int codec_id)
47 { 46 {
48 h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon; 47 h->pred8x8[VERT_PRED8x8 ] = ff_pred8x8_vert_neon;
49 h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon; 48 h->pred8x8[HOR_PRED8x8 ] = ff_pred8x8_hor_neon;
50 h->pred8x8[PLANE_PRED8x8 ] = ff_pred8x8_plane_neon; 49 h->pred8x8[PLANE_PRED8x8 ] = ff_pred8x8_plane_neon;
66 h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon; 65 h->pred16x16[TOP_DC_PRED8x8 ] = ff_pred16x16_top_dc_neon;
67 h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon; 66 h->pred16x16[DC_128_PRED8x8 ] = ff_pred16x16_128_dc_neon;
68 if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40) 67 if (codec_id != CODEC_ID_SVQ3 && codec_id != CODEC_ID_RV40)
69 h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon; 68 h->pred16x16[PLANE_PRED8x8 ] = ff_pred16x16_plane_neon;
70 } 69 }
71 #endif
72 70
73 void ff_h264_pred_init_arm(H264PredContext *h, int codec_id) 71 void ff_h264_pred_init_arm(H264PredContext *h, int codec_id)
74 { 72 {
75 if (HAVE_NEON) ff_h264_pred_init_neon(h, codec_id); 73 if (HAVE_NEON) ff_h264_pred_init_neon(h, codec_id);
76 } 74 }