Revision 8dbe5856 libavcodec/sh4/dsputil_align.c

View differences:

libavcodec/sh4/dsputil_align.c
333 333

  
334 334
void dsputil_init_align(DSPContext* c, AVCodecContext *avctx)
335 335
{
336
        const int h264_high_depth = avctx->codec_id == CODEC_ID_H264 && avctx->bits_per_raw_sample > 8;
337

  
338
        if (!h264_high_depth) {
336 339
        c->put_pixels_tab[0][0] = put_rnd_pixels16_o;
337 340
        c->put_pixels_tab[0][1] = put_rnd_pixels16_x;
338 341
        c->put_pixels_tab[0][2] = put_rnd_pixels16_y;
......
368 371
        c->avg_no_rnd_pixels_tab[1][1] = avg_no_rnd_pixels8_x;
369 372
        c->avg_no_rnd_pixels_tab[1][2] = avg_no_rnd_pixels8_y;
370 373
        c->avg_no_rnd_pixels_tab[1][3] = avg_no_rnd_pixels8_xy;
374
        }
371 375

  
372 376
#ifdef QPEL
373 377

  
......
401 405
    dspfunc(avg_qpel, 1, 8);
402 406
    /* dspfunc(avg_no_rnd_qpel, 1, 8); */
403 407

  
408
    if (!h264_high_depth) {
404 409
    dspfunc(put_h264_qpel, 0, 16);
405 410
    dspfunc(put_h264_qpel, 1, 8);
406 411
    dspfunc(put_h264_qpel, 2, 4);
407 412
    dspfunc(avg_h264_qpel, 0, 16);
408 413
    dspfunc(avg_h264_qpel, 1, 8);
409 414
    dspfunc(avg_h264_qpel, 2, 4);
415
    }
410 416

  
411 417
#undef dspfunc
418
    if (!h264_high_depth) {
412 419
    c->put_h264_chroma_pixels_tab[0]= put_h264_chroma_mc8_sh4;
413 420
    c->put_h264_chroma_pixels_tab[1]= put_h264_chroma_mc4_sh4;
414 421
    c->put_h264_chroma_pixels_tab[2]= put_h264_chroma_mc2_sh4;
415 422
    c->avg_h264_chroma_pixels_tab[0]= avg_h264_chroma_mc8_sh4;
416 423
    c->avg_h264_chroma_pixels_tab[1]= avg_h264_chroma_mc4_sh4;
417 424
    c->avg_h264_chroma_pixels_tab[2]= avg_h264_chroma_mc2_sh4;
425
    }
418 426

  
419 427
    c->put_mspel_pixels_tab[0]= put_mspel8_mc00_sh4;
420 428
    c->put_mspel_pixels_tab[1]= put_mspel8_mc10_sh4;

Also available in: Unified diff