Unified · Split
| @@ -284,6 +284,13 @@ static int rv20_decode_picture_header(RVDecContext *rv, int whole_size) · 283 unmodified lines | |||
| 284 | skip_bits(&s->gb, 5); | 284 | skip_bits(&s->gb, 5); |
| 285 | 285 | ||
| 286 | s->h263_aic = s->pict_type == AV_PICTURE_TYPE_I; | 286 | s->h263_aic = s->pict_type == AV_PICTURE_TYPE_I; |
| 287 | if (s->h263_aic) { | ||
| 288 | s->y_dc_scale_table = | ||
| 289 | s->c_dc_scale_table = ff_aic_dc_scale_table; | ||
| 290 | } else { | ||
| 291 | s->y_dc_scale_table = | ||
| 292 | s->c_dc_scale_table = ff_mpeg1_dc_scale_table; | ||
| 293 | } | ||
| 287 | if (!s->avctx->lowres) | 294 | if (!s->avctx->lowres) |
| 288 | s->loop_filter = 1; | 295 | s->loop_filter = 1; |
| 289 | 296 | ||
| @@ -470,13 +477,6 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf, · 180 unmodified lines | |||
| 470 | } | 477 | } |
| 471 | start_mb_x = s->mb_x; | 478 | start_mb_x = s->mb_x; |
| 472 | s->resync_mb_y = s->mb_y; | 479 | s->resync_mb_y = s->mb_y; |
| 473 | if (s->h263_aic) { | ||
| 474 | s->y_dc_scale_table = | ||
| 475 | s->c_dc_scale_table = ff_aic_dc_scale_table; | ||
| 476 | } else { | ||
| 477 | s->y_dc_scale_table = | ||
| 478 | s->c_dc_scale_table = ff_mpeg1_dc_scale_table; | ||
| 479 | } | ||
| 480 | 480 | ||
| 481 | ff_set_qscale(s, s->qscale); | 481 | ff_set_qscale(s, s->qscale); |
| 482 | 482 | ||