The chroma dc_val pointers are mostly unused (accesses use dc_val[0] and block_index), so remove them.
Unified · Split
| @@ -450,7 +450,7 @@ static void h263_pred_acdc(MpegEncContext * s, int16_t *block, int n) · 449 unmodified lines | ||
| 450 | 450 | { |
| 451 | 451 | int wrap, a, c, pred_dc, scale; |
| 452 | 452 | const int xy = s->block_index[n]; |
| 453 | − int16_t *const dc_val = s->dc_val[0] + xy; | |
| 453 | + int16_t *const dc_val = s->dc_val + xy; | |
| 454 | 454 | int16_t *const ac_val = (s->ac_val + xy)[0]; |
| 455 | 455 | |
| 456 | 456 | /* find prediction */ |
| @@ -596,7 +596,7 @@ static int h263_pred_dc(MPVEncContext *const s, int n, int16_t **dc_val_ptr) · 595 unmodified lines | ||
| 596 | 596 | { |
| 597 | 597 | const int wrap = s->c.block_wrap[n]; |
| 598 | 598 | const int xy = s->c.block_index[n]; |
| 599 | − int16_t *const dc_val = s->c.dc_val[0] + xy; | |
| 599 | + int16_t *const dc_val = s->c.dc_val + xy; | |
| 600 | 600 | int pred_dc; |
| 601 | 601 | |
| 602 | 602 | /* find prediction */ |
| @@ -45,12 +45,11 @@ int ff_mpeg4_set_direct_mv(MpegEncContext *s, int mx, int my); · 44 unmodified lines | ||
| 45 | 45 | static inline int ff_mpeg4_pred_dc(MpegEncContext *s, int n, int *dir_ptr) |
| 46 | 46 | { |
| 47 | 47 | int a, b, c, wrap, pred; |
| 48 | − const int16_t *dc_val; | |
| 48 | + const int16_t *const dc_val = s->dc_val + s->block_index[n]; | |
| 49 | 49 | |
| 50 | 50 | /* find prediction */ |
| 51 | 51 | |
| 52 | 52 | wrap = s->block_wrap[n]; |
| 53 | − dc_val = s->dc_val[0] + s->block_index[n]; | |
| 54 | 53 | |
| 55 | 54 | /* B C |
| 56 | 55 | * A X |
| @@ -920,7 +920,7 @@ static inline int mpeg4_get_level_dc(MpegEncContext *s, int n, int pred, int lev · 919 unmodified lines | ||
| 920 | 920 | else if (!(s->workaround_bugs & FF_BUG_DC_CLIP)) |
| 921 | 921 | level = 2047; |
| 922 | 922 | } |
| 923 | − s->dc_val[0][s->block_index[n]] = level; | |
| 923 | + s->dc_val[s->block_index[n]] = level; | |
| 924 | 924 | |
| 925 | 925 | return ret; |
| 926 | 926 | } |
| @@ -1347,7 +1347,7 @@ static inline int mpeg4_decode_block(Mpeg4DecContext *ctx, int16_t *block, · 420 unmodified lines | ||
| 1347 | 1347 | if (use_intra_dc_vlc) { |
| 1348 | 1348 | /* DC coef */ |
| 1349 | 1349 | if (s->partitioned_frame) { |
| 1350 | − level = s->dc_val[0][s->block_index[n]]; | |
| 1350 | + level = s->dc_val[s->block_index[n]]; | |
| 1351 | 1351 | if (n < 4) |
| 1352 | 1352 | level = FASTDIV((level + (s->y_dc_scale >> 1)), s->y_dc_scale); |
| 1353 | 1353 | else |
| @@ -742,7 +742,7 @@ static void mpeg4_encode_mb(MPVEncContext *const s, int16_t block[][64], · 741 unmodified lines | ||
| 742 | 742 | |
| 743 | 743 | pred = FASTDIV((pred + (scale >> 1)), scale); |
| 744 | 744 | dc_diff[i] = block[i][0] - pred; |
| 745 | − s->c.dc_val[0][s->c.block_index[i]] = av_clip_uintp2(block[i][0] * scale, 11); | |
| 745 | + s->c.dc_val[s->c.block_index[i]] = av_clip_uintp2(block[i][0] * scale, 11); | |
| 746 | 746 | } |
| 747 | 747 | |
| 748 | 748 | if (s->c.avctx->flags & AV_CODEC_FLAG_AC_PRED) { |
| @@ -100,7 +100,6 @@ av_cold int ff_mpeg_er_init(MpegEncContext *s) · 99 unmodified lines | ||
| 100 | 100 | { |
| 101 | 101 | ERContext *er = &s->er; |
| 102 | 102 | int mb_array_size = s->mb_height * s->mb_stride; |
| 103 | − int i; | |
| 104 | 103 | |
| 105 | 104 | er->avctx = s->avctx; |
| 106 | 105 | |
| @@ -111,6 +110,10 @@ av_cold int ff_mpeg_er_init(MpegEncContext *s) · 4 unmodified lines | ||
| 111 | 110 | er->mb_stride = s->mb_stride; |
| 112 | 111 | er->b8_stride = s->b8_stride; |
| 113 | 112 | |
| 113 | + er->dc_val[0] = s->dc_val; | |
| 114 | + er->dc_val[1] = er->dc_val[0] + s->b8_stride * 2 * s->buffer_pools.alloc_mb_height + s->mb_stride; | |
| 115 | + er->dc_val[2] = er->dc_val[1] + s->mb_stride * (s->buffer_pools.alloc_mb_height + 1); | |
| 116 | + | |
| 114 | 117 | er->er_temp_buffer = av_malloc(s->mb_height * s->mb_stride * (4*sizeof(int) + 1)); |
| 115 | 118 | er->error_status_table = av_mallocz(mb_array_size); |
| 116 | 119 | if (!er->er_temp_buffer || !er->error_status_table) |
| @@ -119,9 +122,6 @@ av_cold int ff_mpeg_er_init(MpegEncContext *s) · 2 unmodified lines | ||
| 119 | 122 | er->mbskip_table = s->mbskip_table; |
| 120 | 123 | er->mbintra_table = s->mbintra_table; |
| 121 | 124 | |
| 122 | − for (i = 0; i < FF_ARRAY_ELEMS(s->dc_val); i++) | |
| 123 | − er->dc_val[i] = s->dc_val[i]; | |
| 124 | − | |
| 125 | 125 | er->decode_mb = mpeg_er_decode_mb; |
| 126 | 126 | er->opaque = s; |
| 127 | 127 | |
| @@ -351,9 +351,7 @@ av_cold int ff_mpv_init_context_frame(MpegEncContext *s) · 350 unmodified lines | ||
| 351 | 351 | // that we don't need to reinitialize when e.g. h263_aic changes. |
| 352 | 352 | if (!FF_ALLOC_TYPED_ARRAY(s->dc_val_base, yc_size)) |
| 353 | 353 | return AVERROR(ENOMEM); |
| 354 | − s->dc_val[0] = s->dc_val_base + s->b8_stride + 1; | |
| 355 | − s->dc_val[1] = s->dc_val_base + y_size + s->mb_stride + 1; | |
| 356 | − s->dc_val[2] = s->dc_val[1] + c_size; | |
| 354 | + s->dc_val = s->dc_val_base + s->b8_stride + 1; | |
| 357 | 355 | for (i = 0; i < yc_size; i++) |
| 358 | 356 | s->dc_val_base[i] = 1024; |
| 359 | 357 | } |
| @@ -486,7 +484,7 @@ void ff_clean_intra_table_entries(MpegEncContext *s) · 126 unmodified lines | ||
| 486 | 484 | /* chroma */ |
| 487 | 485 | unsigned uxy = s->block_index[4]; |
| 488 | 486 | unsigned vxy = s->block_index[5]; |
| 489 | − int16_t *dc_val = s->dc_val[0]; | |
| 487 | + int16_t *dc_val = s->dc_val; | |
| 490 | 488 | |
| 491 | 489 | AV_WN32A(dc_val + xy, 1024 << 16 | 1024); |
| 492 | 490 | AV_WN32 (dc_val + xy + wrap, 1024 << 16 | 1024); |
| @@ -141,13 +141,13 @@ typedef struct MpegEncContext { · 140 unmodified lines | ||
| 141 | 141 | int skipped_last_frame; |
| 142 | 142 | int last_dc[3]; ///< last DC values for MPEG-1 |
| 143 | 143 | int16_t *dc_val_base; |
| 144 | − int16_t *dc_val[3]; ///< used for MPEG-4 DC prediction, all 3 arrays must be continuous | |
| 145 | 144 | const uint8_t *y_dc_scale_table; ///< qscale -> y_dc_scale table |
| 146 | 145 | const uint8_t *c_dc_scale_table; ///< qscale -> c_dc_scale table |
| 147 | 146 | const uint8_t *chroma_qscale_table; ///< qscale -> chroma_qscale (H.263) |
| 148 | 147 | uint8_t *coded_block_base; |
| 149 | 148 | uint8_t *coded_block; ///< used for coded block pattern prediction (msmpeg4v3, wmv1) |
| 150 | 149 | int16_t (*ac_val_base)[16]; |
| 150 | + int16_t *dc_val; ///< used for H.263 AIC/MPEG-4 DC prediction and ER | |
| 151 | 151 | int16_t (*ac_val)[16]; ///< used for H.263 AIC, MPEG-4 AC prediction |
| 152 | 152 | int mb_skipped; ///< MUST BE SET only during DECODING |
| 153 | 153 | uint8_t *mbskip_table; /**< used to avoid copy if macroblock skipped (for black regions for example) |
| @@ -3316,7 +3316,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 3315 unmodified lines | ||
| 3316 | 3316 | int16_t ac[6][16]; |
| 3317 | 3317 | const int mvdir = (best_s.c.mv_dir & MV_DIR_BACKWARD) ? 1 : 0; |
| 3318 | 3318 | static const int dquant_tab[4]={-1,1,-2,2}; |
| 3319 | − int storecoefs = s->c.mb_intra && s->c.dc_val[0]; | |
| 3319 | + int storecoefs = s->c.mb_intra && s->c.dc_val; | |
| 3320 | 3320 | |
| 3321 | 3321 | av_assert2(backup_s.dquant == 0); |
| 3322 | 3322 | |
| @@ -3338,7 +3338,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 15 unmodified lines | ||
| 3338 | 3338 | backup_s.dquant= dquant; |
| 3339 | 3339 | if(storecoefs){ |
| 3340 | 3340 | for(i=0; i<6; i++){ |
| 3341 | − dc[i] = s->c.dc_val[0][s->c.block_index[i]]; | |
| 3341 | + dc[i] = s->c.dc_val[s->c.block_index[i]]; | |
| 3342 | 3342 | memcpy(ac[i], s->c.ac_val[s->c.block_index[i]], sizeof(*s->c.ac_val)); |
| 3343 | 3343 | } |
| 3344 | 3344 | } |
| @@ -3348,7 +3348,7 @@ static int encode_thread(AVCodecContext *c, void *arg){ · 3 unmodified lines | ||
| 3348 | 3348 | if (best_s.c.qscale != qp) { |
| 3349 | 3349 | if(storecoefs){ |
| 3350 | 3350 | for(i=0; i<6; i++){ |
| 3351 | − s->c.dc_val[0][s->c.block_index[i]] = dc[i]; | |
| 3351 | + s->c.dc_val[s->c.block_index[i]] = dc[i]; | |
| 3352 | 3352 | memcpy(s->c.ac_val[s->c.block_index[i]], ac[i], sizeof(*s->c.ac_val)); |
| 3353 | 3353 | } |
| 3354 | 3354 | } |
| @@ -197,7 +197,7 @@ int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, · 196 unmodified lines | ||
| 197 | 197 | int16_t **dc_val_ptr, int *dir_ptr) |
| 198 | 198 | { |
| 199 | 199 | int a, b, c, wrap, pred, scale; |
| 200 | − int16_t *dc_val; | |
| 200 | + int16_t *const dc_val = s->dc_val + s->block_index[n]; | |
| 201 | 201 | |
| 202 | 202 | /* find prediction */ |
| 203 | 203 | if (n < 4) { |
| @@ -207,7 +207,6 @@ int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, · 3 unmodified lines | ||
| 207 | 207 | } |
| 208 | 208 | |
| 209 | 209 | wrap = s->block_wrap[n]; |
| 210 | − dc_val= s->dc_val[0] + s->block_index[n]; | |
| 211 | 210 | |
| 212 | 211 | /* B C |
| 213 | 212 | * A X |
| @@ -357,7 +357,7 @@ static inline int vc1_i_pred_dc(MpegEncContext *s, int overlap, int pq, int n, · 356 unmodified lines | ||
| 357 | 357 | scale = s->y_dc_scale; |
| 358 | 358 | |
| 359 | 359 | wrap = s->block_wrap[n]; |
| 360 | − dc_val = s->dc_val[0] + s->block_index[n]; | |
| 360 | + dc_val = s->dc_val + s->block_index[n]; | |
| 361 | 361 | |
| 362 | 362 | /* B A |
| 363 | 363 | * C X |
| @@ -422,7 +422,7 @@ static inline int ff_vc1_pred_dc(MpegEncContext *s, int overlap, int pq, int n, · 58 unmodified lines | ||
| 422 | 422 | return 0; |
| 423 | 423 | |
| 424 | 424 | wrap = s->block_wrap[n]; |
| 425 | − dc_val = s->dc_val[0] + s->block_index[n]; | |
| 425 | + dc_val = s->dc_val + s->block_index[n]; | |
| 426 | 426 | |
| 427 | 427 | /* B A |
| 428 | 428 | * C X |
| @@ -1314,7 +1314,7 @@ static int vc1_decode_p_mb(VC1Context *v) · 885 unmodified lines | ||
| 1314 | 1314 | if (!s->mb_intra) ff_vc1_mc_1mv(v, 0); |
| 1315 | 1315 | dst_idx = 0; |
| 1316 | 1316 | for (i = 0; i < 6; i++) { |
| 1317 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1317 | + s->dc_val[s->block_index[i]] = 0; | |
| 1318 | 1318 | dst_idx += i >> 2; |
| 1319 | 1319 | val = ((cbp >> (5 - i)) & 1); |
| 1320 | 1320 | off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); |
| @@ -1355,7 +1355,7 @@ static int vc1_decode_p_mb(VC1Context *v) · 34 unmodified lines | ||
| 1355 | 1355 | s->mb_intra = 0; |
| 1356 | 1356 | for (i = 0; i < 6; i++) { |
| 1357 | 1357 | v->mb_type[0][s->block_index[i]] = 0; |
| 1358 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1358 | + s->dc_val[s->block_index[i]] = 0; | |
| 1359 | 1359 | } |
| 1360 | 1360 | s->cur_pic.mb_type[mb_pos] = MB_TYPE_SKIP; |
| 1361 | 1361 | s->cur_pic.qscale_table[mb_pos] = 0; |
| @@ -1370,7 +1370,7 @@ static int vc1_decode_p_mb(VC1Context *v) · 8 unmodified lines | ||
| 1370 | 1370 | cbp = get_vlc2(&v->s.gb, v->cbpcy_vlc, VC1_CBPCY_P_VLC_BITS, 2); |
| 1371 | 1371 | for (i = 0; i < 6; i++) { |
| 1372 | 1372 | val = ((cbp >> (5 - i)) & 1); |
| 1373 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1373 | + s->dc_val[s->block_index[i]] = 0; | |
| 1374 | 1374 | s->mb_intra = 0; |
| 1375 | 1375 | if (i < 4) { |
| 1376 | 1376 | dmv_x = dmv_y = 0; |
| @@ -1463,7 +1463,7 @@ static int vc1_decode_p_mb(VC1Context *v) · 86 unmodified lines | ||
| 1463 | 1463 | s->cur_pic.qscale_table[mb_pos] = 0; |
| 1464 | 1464 | for (i = 0; i < 6; i++) { |
| 1465 | 1465 | v->mb_type[0][s->block_index[i]] = 0; |
| 1466 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1466 | + s->dc_val[s->block_index[i]] = 0; | |
| 1467 | 1467 | } |
| 1468 | 1468 | for (i = 0; i < 4; i++) { |
| 1469 | 1469 | ff_vc1_pred_mv(v, i, 0, 0, 0, v->range_x, v->range_y, v->mb_type[0], 0, 0); |
| @@ -1570,7 +1570,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) · 100 unmodified lines | ||
| 1570 | 1570 | for (i = 0; i < 6; i++) { |
| 1571 | 1571 | v->a_avail = v->c_avail = 0; |
| 1572 | 1572 | v->mb_type[0][s->block_index[i]] = 1; |
| 1573 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1573 | + s->dc_val[s->block_index[i]] = 0; | |
| 1574 | 1574 | dst_idx += i >> 2; |
| 1575 | 1575 | val = ((cbp >> (5 - i)) & 1); |
| 1576 | 1576 | if (i == 2 || i == 3 || !s->first_slice_line) |
| @@ -1648,7 +1648,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) · 71 unmodified lines | ||
| 1648 | 1648 | if (!v->ttmbf && cbp) |
| 1649 | 1649 | ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index], VC1_TTMB_VLC_BITS, 2); |
| 1650 | 1650 | for (i = 0; i < 6; i++) { |
| 1651 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1651 | + s->dc_val[s->block_index[i]] = 0; | |
| 1652 | 1652 | dst_idx += i >> 2; |
| 1653 | 1653 | val = ((cbp >> (5 - i)) & 1); |
| 1654 | 1654 | if (!fieldtx) |
| @@ -1673,7 +1673,7 @@ static int vc1_decode_p_mb_intfr(VC1Context *v) · 18 unmodified lines | ||
| 1673 | 1673 | s->mb_intra = v->is_intra[s->mb_x] = 0; |
| 1674 | 1674 | for (i = 0; i < 6; i++) { |
| 1675 | 1675 | v->mb_type[0][s->block_index[i]] = 0; |
| 1676 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1676 | + s->dc_val[s->block_index[i]] = 0; | |
| 1677 | 1677 | } |
| 1678 | 1678 | s->cur_pic.mb_type[mb_pos] = MB_TYPE_SKIP; |
| 1679 | 1679 | s->cur_pic.qscale_table[mb_pos] = 0; |
| @@ -1736,7 +1736,7 @@ static int vc1_decode_p_mb_intfi(VC1Context *v) · 56 unmodified lines | ||
| 1736 | 1736 | for (i = 0; i < 6; i++) { |
| 1737 | 1737 | v->a_avail = v->c_avail = 0; |
| 1738 | 1738 | v->mb_type[0][s->block_index[i]] = 1; |
| 1739 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1739 | + s->dc_val[s->block_index[i]] = 0; | |
| 1740 | 1740 | dst_idx += i >> 2; |
| 1741 | 1741 | val = ((cbp >> (5 - i)) & 1); |
| 1742 | 1742 | if (i == 2 || i == 3 || !s->first_slice_line) |
| @@ -1789,7 +1789,7 @@ static int vc1_decode_p_mb_intfi(VC1Context *v) · 46 unmodified lines | ||
| 1789 | 1789 | } |
| 1790 | 1790 | dst_idx = 0; |
| 1791 | 1791 | for (i = 0; i < 6; i++) { |
| 1792 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1792 | + s->dc_val[s->block_index[i]] = 0; | |
| 1793 | 1793 | dst_idx += i >> 2; |
| 1794 | 1794 | val = ((cbp >> (5 - i)) & 1); |
| 1795 | 1795 | off = (i & 4) ? 0 : (i & 1) * 8 + (i & 2) * 4 * s->linesize; |
| @@ -1854,7 +1854,7 @@ static int vc1_decode_b_mb(VC1Context *v) · 58 unmodified lines | ||
| 1854 | 1854 | dmv_x[0] = dmv_x[1] = dmv_y[0] = dmv_y[1] = 0; |
| 1855 | 1855 | for (i = 0; i < 6; i++) { |
| 1856 | 1856 | v->mb_type[0][s->block_index[i]] = 0; |
| 1857 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1857 | + s->dc_val[s->block_index[i]] = 0; | |
| 1858 | 1858 | } |
| 1859 | 1859 | s->cur_pic.qscale_table[mb_pos] = 0; |
| 1860 | 1860 | |
| @@ -1937,7 +1937,7 @@ static int vc1_decode_b_mb(VC1Context *v) · 76 unmodified lines | ||
| 1937 | 1937 | } |
| 1938 | 1938 | dst_idx = 0; |
| 1939 | 1939 | for (i = 0; i < 6; i++) { |
| 1940 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 1940 | + s->dc_val[s->block_index[i]] = 0; | |
| 1941 | 1941 | dst_idx += i >> 2; |
| 1942 | 1942 | val = ((cbp >> (5 - i)) & 1); |
| 1943 | 1943 | off = (i & 4) ? 0 : ((i & 1) * 8 + (i & 2) * 4 * s->linesize); |
| @@ -2023,7 +2023,7 @@ static int vc1_decode_b_mb_intfi(VC1Context *v) · 79 unmodified lines | ||
| 2023 | 2023 | for (i = 0; i < 6; i++) { |
| 2024 | 2024 | v->a_avail = v->c_avail = 0; |
| 2025 | 2025 | v->mb_type[0][s->block_index[i]] = 1; |
| 2026 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 2026 | + s->dc_val[s->block_index[i]] = 0; | |
| 2027 | 2027 | dst_idx += i >> 2; |
| 2028 | 2028 | val = ((cbp >> (5 - i)) & 1); |
| 2029 | 2029 | if (i == 2 || i == 3 || !s->first_slice_line) |
| @@ -2124,7 +2124,7 @@ static int vc1_decode_b_mb_intfi(VC1Context *v) · 94 unmodified lines | ||
| 2124 | 2124 | } |
| 2125 | 2125 | dst_idx = 0; |
| 2126 | 2126 | for (i = 0; i < 6; i++) { |
| 2127 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 2127 | + s->dc_val[s->block_index[i]] = 0; | |
| 2128 | 2128 | dst_idx += i >> 2; |
| 2129 | 2129 | val = ((cbp >> (5 - i)) & 1); |
| 2130 | 2130 | off = (i & 4) ? 0 : (i & 1) * 8 + (i & 2) * 4 * s->linesize; |
| @@ -2219,7 +2219,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) · 88 unmodified lines | ||
| 2219 | 2219 | for (i = 0; i < 6; i++) { |
| 2220 | 2220 | v->a_avail = v->c_avail = 0; |
| 2221 | 2221 | v->mb_type[0][s->block_index[i]] = 1; |
| 2222 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 2222 | + s->dc_val[s->block_index[i]] = 0; | |
| 2223 | 2223 | dst_idx += i >> 2; |
| 2224 | 2224 | val = ((cbp >> (5 - i)) & 1); |
| 2225 | 2225 | if (i == 2 || i == 3 || !s->first_slice_line) |
| @@ -2422,7 +2422,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) · 196 unmodified lines | ||
| 2422 | 2422 | if (!v->ttmbf && cbp) |
| 2423 | 2423 | ttmb = get_vlc2(gb, ff_vc1_ttmb_vlc[v->tt_index], VC1_TTMB_VLC_BITS, 2); |
| 2424 | 2424 | for (i = 0; i < 6; i++) { |
| 2425 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 2425 | + s->dc_val[s->block_index[i]] = 0; | |
| 2426 | 2426 | dst_idx += i >> 2; |
| 2427 | 2427 | val = ((cbp >> (5 - i)) & 1); |
| 2428 | 2428 | if (!fieldtx) |
| @@ -2447,7 +2447,7 @@ static int vc1_decode_b_mb_intfr(VC1Context *v) · 18 unmodified lines | ||
| 2447 | 2447 | dir = 0; |
| 2448 | 2448 | for (i = 0; i < 6; i++) { |
| 2449 | 2449 | v->mb_type[0][s->block_index[i]] = 0; |
| 2450 | − s->dc_val[0][s->block_index[i]] = 0; | |
| 2450 | + s->dc_val[s->block_index[i]] = 0; | |
| 2451 | 2451 | } |
| 2452 | 2452 | s->cur_pic.mb_type[mb_pos] = MB_TYPE_SKIP; |
| 2453 | 2453 | s->cur_pic.qscale_table[mb_pos] = 0; |