aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2025-05-25 16:23:42 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2025-06-21 22:08:51 +0200
commitea4b9a121d05bb29d4a2b4fe2ebfd72524461a69 (patch)
tree7665e27d6bdb29497c4841f26ce9df800053c195
parentf5fc31acecdef68fae669faa96a3ee0914989859 (diff)
downloadffmpeg-ea4b9a121d05bb29d4a2b4fe2ebfd72524461a69.tar.gz
avcodec/rv10: Perform RV20 check only for RV20
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/rv10.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/libavcodec/rv10.c b/libavcodec/rv10.c
index 1aae92a358..7f7f7aeba2 100644
--- a/libavcodec/rv10.c
+++ b/libavcodec/rv10.c
@@ -284,6 +284,13 @@ static int rv20_decode_picture_header(RVDecContext *rv, int whole_size)
skip_bits(&s->gb, 5);
s->h263_aic = s->pict_type == AV_PICTURE_TYPE_I;
+ if (s->h263_aic) {
+ s->y_dc_scale_table =
+ s->c_dc_scale_table = ff_aic_dc_scale_table;
+ } else {
+ s->y_dc_scale_table =
+ s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
+ }
if (!s->avctx->lowres)
s->loop_filter = 1;
@@ -470,13 +477,6 @@ static int rv10_decode_packet(AVCodecContext *avctx, const uint8_t *buf,
}
start_mb_x = s->mb_x;
s->resync_mb_y = s->mb_y;
- if (s->h263_aic) {
- s->y_dc_scale_table =
- s->c_dc_scale_table = ff_aic_dc_scale_table;
- } else {
- s->y_dc_scale_table =
- s->c_dc_scale_table = ff_mpeg1_dc_scale_table;
- }
ff_set_qscale(s, s->qscale);