Unified · Split
| @@ -284,7 +284,6 @@ 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 | s->modified_quant = 1; | ||
| 288 | if (!s->avctx->lowres) | 287 | if (!s->avctx->lowres) |
| 289 | s->loop_filter = 1; | 288 | s->loop_filter = 1; |
| 290 | 289 | ||
| @@ -370,6 +369,10 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx) · 79 unmodified lines | |||
| 370 | 369 | ||
| 371 | s->h263_long_vectors = avctx->extradata[3] & 1; | 370 | s->h263_long_vectors = avctx->extradata[3] & 1; |
| 372 | rv->sub_id = AV_RB32A(avctx->extradata + 4); | 371 | rv->sub_id = AV_RB32A(avctx->extradata + 4); |
| 372 | if (avctx->codec_id == AV_CODEC_ID_RV20) { | ||
| 373 | s->modified_quant = 1; | ||
| 374 | s->chroma_qscale_table = ff_h263_chroma_qscale_table; | ||
| 375 | } | ||
| 373 | 376 | ||
| 374 | major_ver = RV_GET_MAJOR_VER(rv->sub_id); | 377 | major_ver = RV_GET_MAJOR_VER(rv->sub_id); |
| 375 | minor_ver = RV_GET_MINOR_VER(rv->sub_id); | 378 | minor_ver = RV_GET_MINOR_VER(rv->sub_id); |
| @@ -475,9 +478,6 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf, · 99 unmodified lines | |||
| 475 | s->c_dc_scale_table = ff_mpeg1_dc_scale_table; | 478 | s->c_dc_scale_table = ff_mpeg1_dc_scale_table; |
| 476 | } | 479 | } |
| 477 | 480 | ||
| 478 | if (s->modified_quant) | ||
| 479 | s->chroma_qscale_table = ff_h263_chroma_qscale_table; | ||
| 480 | |||
| 481 | ff_set_qscale(s, s->qscale); | 481 | ff_set_qscale(s, s->qscale); |
| 482 | 482 | ||
| 483 | s->rv10_first_dc_coded[0] = 0; | 483 | s->rv10_first_dc_coded[0] = 0; |