diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-19 18:22:55 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-24 00:46:56 +0200 |
| commit | 4c9dee6e8d0b7bc4e5d9af6a927ee43d71f7e86d (patch) | |
| tree | e19e530c740dbb994b22a3512e0258d07bfed7a5 /libavcodec | |
| parent | 3cabe958a79fa3dcd2009827ba35a91b179e2dcc (diff) | |
| download | ffmpeg-4c9dee6e8d0b7bc4e5d9af6a927ee43d71f7e86d.tar.gz | |
avcodec/aic: Remove useless ScanTable
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/aic.c | 11 |
1 files 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; @@ -453,9 +451,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]; ctx->mb_width = FFALIGN(avctx->width, 16) >> 4; |