[FFmpeg-cvslog] avcodec/aic: Remove useless ScanTable
Andreas Rheinhardt
git at videolan.org
Mon Oct 24 02:41:12 EEST 2022
ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Wed Oct 19 18:22:55 2022 +0200| [4c9dee6e8d0b7bc4e5d9af6a927ee43d71f7e86d] | committer: Andreas Rheinhardt
avcodec/aic: Remove useless ScanTable
Reviewed-by: Peter Ross <pross at xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4c9dee6e8d0b7bc4e5d9af6a927ee43d71f7e86d
---
libavcodec/aic.c | 11 +++--------
1 file changed, 3 insertions(+), 8 deletions(-)
diff --git a/libavcodec/aic.c b/libavcodec/aic.c
index 49d08f0556..7ba1c02fdd 100644
--- a/libavcodec/aic.c
+++ b/libavcodec/aic.c
@@ -143,7 +143,6 @@ typedef struct AICContext {
AVCodecContext *avctx;
AVFrame *frame;
IDCTDSPContext idsp;
- ScanTable scantable;
int num_x_slices;
int slice_width;
@@ -348,10 +347,10 @@ static int aic_decode_slice(AICContext *ctx, int mb_x, int mb_y,
for (mb = 0; mb < slice_width; mb++) {
for (blk = 0; blk < 4; blk++) {
if (!ctx->interlaced)
- recombine_block(ctx->block, ctx->scantable.permutated,
+ recombine_block(ctx->block, ctx->idsp.idct_permutation,
&base_y, &ext_y);
else
- recombine_block_il(ctx->block, ctx->scantable.permutated,
+ recombine_block_il(ctx->block, ctx->idsp.idct_permutation,
&base_y, &ext_y, blk);
unquant_block(ctx->block, ctx->quant, ctx->quant_matrix);
ctx->idsp.idct(ctx->block);
@@ -368,7 +367,7 @@ static int aic_decode_slice(AICContext *ctx, int mb_x, int mb_y,
Y += 16;
for (blk = 0; blk < 2; blk++) {
- recombine_block(ctx->block, ctx->scantable.permutated,
+ recombine_block(ctx->block, ctx->idsp.idct_permutation,
&base_c, &ext_c);
unquant_block(ctx->block, ctx->quant, ctx->quant_matrix);
ctx->idsp.idct(ctx->block);
@@ -444,7 +443,6 @@ static av_cold int aic_decode_init(AVCodecContext *avctx)
{
AICContext *ctx = avctx->priv_data;
int i;
- uint8_t scan[64];
ctx->avctx = avctx;
@@ -452,9 +450,6 @@ static av_cold int aic_decode_init(AVCodecContext *avctx)
ff_idctdsp_init(&ctx->idsp, avctx);
- for (i = 0; i < 64; i++)
- scan[i] = i;
- ff_init_scantable(ctx->idsp.idct_permutation, &ctx->scantable, scan);
for (i = 0; i < 64; i++)
ctx->quant_matrix[ctx->idsp.idct_permutation[i]] = aic_quant_matrix[i];
More information about the ffmpeg-cvslog
mailing list