diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-20 05:30:10 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-10-24 00:46:53 +0200 |
| commit | 3cabe958a79fa3dcd2009827ba35a91b179e2dcc (patch) | |
| tree | c29996af7c7393576f6211825a89d3d75fd83ee1 /libavcodec | |
| parent | a8f34f0877e348eef4e84a8466b413c6d438b14b (diff) | |
| download | ffmpeg-3cabe958a79fa3dcd2009827ba35a91b179e2dcc.tar.gz | |
avcodec/eatqi: Don't use IDCTDSP-API unnecessarily
The eatqi decoder uses a custom IDCT and actually does not
use the IDCTDSP API at all. Somehow it was nevertheless
used to simply apply the identity permutation on ff_zigzag_direct.
This commit stops doing so.
Reviewed-by: Peter Ross <pross@xvid.org>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/eatqi.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/libavcodec/eatqi.c b/libavcodec/eatqi.c index 324e6f1ced..e4f12b3db2 100644 --- a/libavcodec/eatqi.c +++ b/libavcodec/eatqi.c @@ -36,7 +36,6 @@ #include "get_bits.h" #include "aandcttab.h" #include "eaidct.h" -#include "idctdsp.h" #include "mpeg12data.h" #include "mpeg12dec.h" @@ -45,8 +44,6 @@ typedef struct TqiContext { GetBitContext gb; BlockDSPContext bdsp; BswapDSPContext bsdsp; - IDCTDSPContext idsp; - ScanTable intra_scantable; void *bitstream_buf; unsigned int bitstream_buf_size; @@ -64,9 +61,6 @@ static av_cold int tqi_decode_init(AVCodecContext *avctx) ff_blockdsp_init(&t->bdsp); ff_bswapdsp_init(&t->bsdsp); - ff_idctdsp_init(&t->idsp, avctx); - ff_init_scantable_permutation(t->idsp.idct_permutation, FF_IDCT_PERM_NONE); - ff_init_scantable(t->idsp.idct_permutation, &t->intra_scantable, ff_zigzag_direct); avctx->framerate = (AVRational){ 15, 1 }; avctx->pix_fmt = AV_PIX_FMT_YUV420P; @@ -82,7 +76,7 @@ static int tqi_decode_mb(TqiContext *t, int16_t (*block)[64]) for (n = 0; n < 6; n++) { int ret = ff_mpeg1_decode_block_intra(&t->gb, t->intra_matrix, - t->intra_scantable.permutated, + ff_zigzag_direct, t->last_dc, block[n], n, 1); if (ret < 0) { av_log(t->avctx, AV_LOG_ERROR, "ac-tex damaged at %d %d\n", |