Revision 19fb234e libavcodec/h264_cabac.c

View differences:

libavcodec/h264_cabac.c
1597 1597
    s->current_picture.mb_type[mb_xy]= mb_type;
1598 1598

  
1599 1599
    if( cbp || IS_INTRA16x16( mb_type ) ) {
1600
        const uint8_t *scan, *scan8x8, *dc_scan;
1600
        const uint8_t *scan, *scan8x8;
1601 1601
        const uint32_t *qmul;
1602 1602

  
1603 1603
        if(IS_INTERLACED(mb_type)){
1604 1604
            scan8x8= s->qscale ? h->field_scan8x8 : h->field_scan8x8_q0;
1605 1605
            scan= s->qscale ? h->field_scan : h->field_scan_q0;
1606
            dc_scan= luma_dc_field_scan;
1607 1606
        }else{
1608 1607
            scan8x8= s->qscale ? h->zigzag_scan8x8 : h->zigzag_scan8x8_q0;
1609 1608
            scan= s->qscale ? h->zigzag_scan : h->zigzag_scan_q0;
1610
            dc_scan= luma_dc_zigzag_scan;
1611 1609
        }
1612 1610

  
1613 1611
        // decode_cabac_mb_dqp
......
1642 1640
        if( IS_INTRA16x16( mb_type ) ) {
1643 1641
            int i;
1644 1642
            //av_log( s->avctx, AV_LOG_ERROR, "INTRA16x16 DC\n" );
1645
            decode_cabac_residual_dc( h, h->mb, 0, 0, dc_scan, 16);
1643
            AV_ZERO128(h->mb_luma_dc+0);
1644
            AV_ZERO128(h->mb_luma_dc+8);
1645
            decode_cabac_residual_dc( h, h->mb_luma_dc, 0, 0, scan, 16);
1646 1646

  
1647 1647
            if( cbp&15 ) {
1648 1648
                qmul = h->dequant4_coeff[0][s->qscale];

Also available in: Unified diff