Revision 8dbe5856 libavcodec/arm/dsputil_init_neon.c

View differences:

libavcodec/arm/dsputil_init_neon.c
173 173

  
174 174
void ff_dsputil_init_neon(DSPContext *c, AVCodecContext *avctx)
175 175
{
176
    const int h264_high_depth = avctx->codec_id == CODEC_ID_H264 && avctx->bits_per_raw_sample > 8;
177

  
176 178
    if (!avctx->lowres) {
177 179
        if (avctx->idct_algo == FF_IDCT_AUTO ||
178 180
            avctx->idct_algo == FF_IDCT_SIMPLENEON) {
......
190 192
        }
191 193
    }
192 194

  
195
    if (!h264_high_depth) {
193 196
    c->clear_block  = ff_clear_block_neon;
194 197
    c->clear_blocks = ff_clear_blocks_neon;
195 198

  
......
213 216

  
214 217
    c->avg_pixels_tab[0][0] = ff_avg_pixels16_neon;
215 218
    c->avg_pixels_tab[1][0] = ff_avg_pixels8_neon;
219
    }
216 220

  
217 221
    c->add_pixels_clamped = ff_add_pixels_clamped_neon;
218 222
    c->put_pixels_clamped = ff_put_pixels_clamped_neon;
219 223
    c->put_signed_pixels_clamped = ff_put_signed_pixels_clamped_neon;
220 224

  
221 225
    if (CONFIG_H264_DECODER) {
226
        if (!h264_high_depth) {
222 227
        c->put_h264_chroma_pixels_tab[0] = ff_put_h264_chroma_mc8_neon;
223 228
        c->put_h264_chroma_pixels_tab[1] = ff_put_h264_chroma_mc4_neon;
224 229
        c->put_h264_chroma_pixels_tab[2] = ff_put_h264_chroma_mc2_neon;
......
294 299
        c->avg_h264_qpel_pixels_tab[1][13] = ff_avg_h264_qpel8_mc13_neon;
295 300
        c->avg_h264_qpel_pixels_tab[1][14] = ff_avg_h264_qpel8_mc23_neon;
296 301
        c->avg_h264_qpel_pixels_tab[1][15] = ff_avg_h264_qpel8_mc33_neon;
302
        }
297 303
    }
298 304

  
299 305
    if (CONFIG_VP3_DECODER) {

Also available in: Unified diff