diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-07-31 09:17:44 +0200 |
|---|---|---|
| committer | Andreas Rheinhardt <andreas.rheinhardt@outlook.com> | 2022-08-03 21:10:00 +0200 |
| commit | eb5c5ae658aaf8cd7c03e1d0a6c84274d3a39a66 (patch) | |
| tree | 5728fc257a7a3c723c42356cfba21e1d98d910bc /libavcodec | |
| parent | 8d7d52721aa893715739acde602b27dcd2adce97 (diff) | |
| download | ffmpeg-eb5c5ae658aaf8cd7c03e1d0a6c84274d3a39a66.tar.gz | |
avcodec/intrax8: Remove unused IDCTDSPContext
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/intrax8.c | 4 | ||||
| -rw-r--r-- | libavcodec/intrax8.h | 3 | ||||
| -rw-r--r-- | libavcodec/vc1dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/wmv2dec.c | 2 |
4 files changed, 4 insertions, 7 deletions
diff --git a/libavcodec/intrax8.c b/libavcodec/intrax8.c index 73b8aeea78..b99e8590b1 100644 --- a/libavcodec/intrax8.c +++ b/libavcodec/intrax8.c @@ -25,7 +25,6 @@ #include "libavutil/thread.h" #include "avcodec.h" #include "get_bits.h" -#include "idctdsp.h" #include "msmpeg4data.h" #include "intrax8huf.h" #include "intrax8.h" @@ -692,7 +691,7 @@ static void x8_init_block_index(IntraX8Context *w, AVFrame *frame) } av_cold int ff_intrax8_common_init(AVCodecContext *avctx, - IntraX8Context *w, IDCTDSPContext *idsp, + IntraX8Context *w, int16_t (*block)[64], int block_last_index[12], int mb_width, int mb_height) @@ -700,7 +699,6 @@ av_cold int ff_intrax8_common_init(AVCodecContext *avctx, static AVOnce init_static_once = AV_ONCE_INIT; w->avctx = avctx; - w->idsp = *idsp; w->mb_width = mb_width; w->mb_height = mb_height; w->block = block; diff --git a/libavcodec/intrax8.h b/libavcodec/intrax8.h index 5b8946ea25..3ebbf73434 100644 --- a/libavcodec/intrax8.h +++ b/libavcodec/intrax8.h @@ -44,7 +44,6 @@ typedef struct IntraX8Context { // set by the caller codec IntraX8DSPContext dsp; - IDCTDSPContext idsp; BlockDSPContext bdsp; int quant; int dquant; @@ -86,7 +85,7 @@ typedef struct IntraX8Context { * @return 0 on success, a negative AVERROR value on error */ int ff_intrax8_common_init(AVCodecContext *avctx, - IntraX8Context *w, IDCTDSPContext *idsp, + IntraX8Context *w, int16_t (*block)[64], int block_last_index[12], int mb_width, int mb_height); diff --git a/libavcodec/vc1dec.c b/libavcodec/vc1dec.c index 5c5b31ad32..b53490b3ab 100644 --- a/libavcodec/vc1dec.c +++ b/libavcodec/vc1dec.c @@ -391,7 +391,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v) goto error; } - ret = ff_intrax8_common_init(s->avctx, &v->x8, &s->idsp, + ret = ff_intrax8_common_init(s->avctx, &v->x8, s->block, s->block_last_index, s->mb_width, s->mb_height); if (ret < 0) diff --git a/libavcodec/wmv2dec.c b/libavcodec/wmv2dec.c index e61b549439..6d9b72d123 100644 --- a/libavcodec/wmv2dec.c +++ b/libavcodec/wmv2dec.c @@ -578,7 +578,7 @@ static av_cold int wmv2_decode_init(AVCodecContext *avctx) ff_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[1], ff_wmv2_scantableB); - return ff_intrax8_common_init(avctx, &w->x8, &w->s.idsp, + return ff_intrax8_common_init(avctx, &w->x8, w->s.block, w->s.block_last_index, w->s.mb_width, w->s.mb_height); } |