aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-20 05:47:02 +0200
committerAndreas Rheinhardt <andreas.rheinhardt@outlook.com>2022-10-24 00:47:05 +0200
commitf1a7bf0227d2979a0b8acf2f3c972da665713ee2 (patch)
treee61eb08854d0b6802c3ee8d25fe327fa5e4cf4ab
parent250d556343d4886a01f288480f9d3e9a2e0a33b0 (diff)
downloadffmpeg-f1a7bf0227d2979a0b8acf2f3c972da665713ee2.tar.gz
avcodec/g2meet: Only keep what is used from ScanTable
Namely ScanTable.permutated. Reviewed-by: Peter Ross <pross@xvid.org> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
-rw-r--r--libavcodec/g2meet.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c
index 4367af3dc0..1973ed0741 100644
--- a/libavcodec/g2meet.c
+++ b/libavcodec/g2meet.c
@@ -120,7 +120,7 @@ typedef struct ePICContext {
typedef struct JPGContext {
BlockDSPContext bdsp;
IDCTDSPContext idsp;
- ScanTable scantable;
+ uint8_t permutated_scantable[64];
VLC dc_vlc[2], ac_vlc[2];
int prev_dc[3];
@@ -182,8 +182,8 @@ static av_cold int jpg_init(AVCodecContext *avctx, JPGContext *c)
ff_blockdsp_init(&c->bdsp);
ff_idctdsp_init(&c->idsp, avctx);
- ff_init_scantable(c->idsp.idct_permutation, &c->scantable,
- ff_zigzag_direct);
+ ff_permute_scantable(c->permutated_scantable, ff_zigzag_direct,
+ c->idsp.idct_permutation);
return 0;
}
@@ -251,7 +251,7 @@ static int jpg_decode_block(JPGContext *c, GetBitContext *gb,
val = get_xbits(gb, nbits);
val *= qmat[ff_zigzag_direct[pos]];
- block[c->scantable.permutated[pos]] = val;
+ block[c->permutated_scantable[pos]] = val;
}
}
return 0;