Only the intra scantable is used for studio profile.
Signed-off-by: Andreas Rheinhardt <[email protected]>
---
libavcodec/mpeg4videodec.c | 17 ++---------------
1 file changed, 2 insertions(+), 15 deletions(-)
diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c
index f1b542cebf..18329132aa 100644
--- a/libavcodec/mpeg4videodec.c
+++ b/libavcodec/mpeg4videodec.c
@@ -3430,21 +3430,8 @@ static int decode_studio_vop_header(Mpeg4DecContext
*ctx, GetBitContext *gb)
s->q_scale_type = get_bits1(gb);
}
- if (s->alternate_scan) {
- ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable,
ff_alternate_vertical_scan);
- ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable,
ff_alternate_vertical_scan);
- ff_permute_scantable(s->permutated_intra_h_scantable,
ff_alternate_vertical_scan,
- s->idsp.idct_permutation);
- ff_permute_scantable(s->permutated_intra_v_scantable,
ff_alternate_vertical_scan,
- s->idsp.idct_permutation);
- } else {
- ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable,
ff_zigzag_direct);
- ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable,
ff_zigzag_direct);
- ff_permute_scantable(s->permutated_intra_h_scantable,
ff_alternate_horizontal_scan,
- s->idsp.idct_permutation);
- ff_permute_scantable(s->permutated_intra_v_scantable,
ff_alternate_vertical_scan,
- s->idsp.idct_permutation);
- }
+ ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable,
+ s->alternate_scan ? ff_alternate_vertical_scan :
ff_zigzag_direct);
mpeg4_load_default_matrices(s);
--
2.40.1
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
