aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/msmpeg4.c
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-20 19:03:01 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-24 01:23:59 +0200
commit5ec9d26b2b50c535c07c0c8fb69650fbad0be892 (patch)
tree15936598fb8d6cfdd024bbc271a0a3ac20fc6065 /libavcodec/msmpeg4.c
parent33b838aad6fc30609c0bbbe524dbc16fe53ccf81 (diff)
downloadffmpeg-5ec9d26b2b50c535c07c0c8fb69650fbad0be892.tar.gz
avcodec/mpegvideo: Don't use ScanTable where unnecessary
For the intra_[hv]_scantables, only ScanTable.permutated is used, so one only needs to keep that. Reviewed-by: Michael Niedermayer <michael@niedermayer.cc> Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec/msmpeg4.c')
-rw-r--r--libavcodec/msmpeg4.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c
index 455436e9c4..3f5dc23130 100644
--- a/libavcodec/msmpeg4.c
+++ b/libavcodec/msmpeg4.c
@@ -150,9 +150,11 @@ av_cold void ff_msmpeg4_common_init(MpegEncContext *s)
if(s->msmpeg4_version>=4){
ff_init_scantable(s->idsp.idct_permutation, &s->intra_scantable, ff_wmv1_scantable[1]);
- ff_init_scantable(s->idsp.idct_permutation, &s->intra_h_scantable, ff_wmv1_scantable[2]);
- ff_init_scantable(s->idsp.idct_permutation, &s->intra_v_scantable, ff_wmv1_scantable[3]);
ff_init_scantable(s->idsp.idct_permutation, &s->inter_scantable, ff_wmv1_scantable[0]);
+ ff_permute_scantable(s->permutated_intra_h_scantable, ff_wmv1_scantable[2],
+ s->idsp.idct_permutation);
+ ff_permute_scantable(s->permutated_intra_v_scantable, ff_wmv1_scantable[3],
+ s->idsp.idct_permutation);
}
//Note the default tables are set in common_init in mpegvideo.c