Revision bb39171b libavcodec/rv34.c

View differences:

libavcodec/rv34.c
1148 1148

  
1149 1149
    s->qscale = r->si.quant;
1150 1150
    cbp = cbp2 = rv34_decode_mb_header(r, intra_types);
1151
    r->cbp_luma  [s->mb_x + s->mb_y * s->mb_stride] = cbp;
1152
    r->cbp_chroma[s->mb_x + s->mb_y * s->mb_stride] = cbp >> 16;
1151
    r->cbp_luma  [mb_pos] = cbp;
1152
    r->cbp_chroma[mb_pos] = cbp >> 16;
1153 1153
    if(s->pict_type == FF_I_TYPE)
1154 1154
        r->deblock_coefs[mb_pos] = 0xFFFF;
1155 1155
    else
1156 1156
        r->deblock_coefs[mb_pos] = rv34_set_deblock_coef(r) | r->cbp_luma[mb_pos];
1157
    s->current_picture_ptr->qscale_table[s->mb_x + s->mb_y * s->mb_stride] = s->qscale;
1157
    s->current_picture_ptr->qscale_table[mb_pos] = s->qscale;
1158 1158

  
1159 1159
    if(cbp == -1)
1160 1160
        return -1;
......
1188 1188
        rv34_dequant4x4(s->block[blknum] + blkoff, rv34_qscale_tab[rv34_chroma_quant[1][s->qscale]],rv34_qscale_tab[rv34_chroma_quant[0][s->qscale]]);
1189 1189
        rv34_inv_transform(s->block[blknum] + blkoff);
1190 1190
    }
1191
    if(IS_INTRA(s->current_picture_ptr->mb_type[s->mb_x + s->mb_y*s->mb_stride]))
1191
    if(IS_INTRA(s->current_picture_ptr->mb_type[mb_pos]))
1192 1192
        rv34_output_macroblock(r, intra_types, cbp2, r->is16);
1193 1193
    else
1194 1194
        rv34_apply_differences(r, cbp2);

Also available in: Unified diff