virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avcodec/intrax8: Remove unused IDCTDSPContext

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2022-07-31 09:17:44 +02:00
parent 8d7d52721a
commit eb5c5ae658
5 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -2733,7 +2733,7 @@ h264dsp_select="startcode"
hevcparse_select="atsc_a53 golomb" hevcparse_select="atsc_a53 golomb"
frame_thread_encoder_deps="encoders threads" frame_thread_encoder_deps="encoders threads"
inflate_wrapper_deps="zlib" inflate_wrapper_deps="zlib"
intrax8_select="blockdsp idctdsp" intrax8_select="blockdsp"
iso_media_select="mpeg4audio" iso_media_select="mpeg4audio"
mdct_select="fft" mdct_select="fft"
mdct15_select="fft" mdct15_select="fft"

4
libavcodec/intrax8.c
View File

@ -25,7 +25,6 @@
#include "libavutil/thread.h" #include "libavutil/thread.h"
#include "avcodec.h" #include "avcodec.h"
#include "get_bits.h" #include "get_bits.h"
#include "idctdsp.h"
#include "msmpeg4data.h" #include "msmpeg4data.h"
#include "intrax8huf.h" #include "intrax8huf.h"
#include "intrax8.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, av_cold int ff_intrax8_common_init(AVCodecContext *avctx,
IntraX8Context *w, IDCTDSPContext *idsp, IntraX8Context *w,
int16_t (*block)[64], int16_t (*block)[64],
int block_last_index[12], int block_last_index[12],
int mb_width, int mb_height) 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; static AVOnce init_static_once = AV_ONCE_INIT;
w->avctx = avctx; w->avctx = avctx;
w->idsp = *idsp;
w->mb_width = mb_width; w->mb_width = mb_width;
w->mb_height = mb_height; w->mb_height = mb_height;
w->block = block; w->block = block;

3
libavcodec/intrax8.h
View File

@ -44,7 +44,6 @@ typedef struct IntraX8Context {
// set by the caller codec // set by the caller codec
IntraX8DSPContext dsp; IntraX8DSPContext dsp;
IDCTDSPContext idsp;
BlockDSPContext bdsp; BlockDSPContext bdsp;
int quant; int quant;
int dquant; int dquant;
@ -86,7 +85,7 @@ typedef struct IntraX8Context {
* @return 0 on success, a negative AVERROR value on error * @return 0 on success, a negative AVERROR value on error
*/ */
int ff_intrax8_common_init(AVCodecContext *avctx, int ff_intrax8_common_init(AVCodecContext *avctx,
IntraX8Context *w, IDCTDSPContext *idsp, IntraX8Context *w,
int16_t (*block)[64], int16_t (*block)[64],
int block_last_index[12], int block_last_index[12],
int mb_width, int mb_height); int mb_width, int mb_height);

2
libavcodec/vc1dec.c
View File

@ -391,7 +391,7 @@ av_cold int ff_vc1_decode_init_alloc_tables(VC1Context *v)
goto error; 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->block, s->block_last_index,
s->mb_width, s->mb_height); s->mb_width, s->mb_height);
if (ret < 0) if (ret < 0)

2
libavcodec/wmv2dec.c
View File

@ -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_init_scantable(s->idsp.idct_permutation, &w->abt_scantable[1],
ff_wmv2_scantableB); 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.block, w->s.block_last_index,
w->s.mb_width, w->s.mb_height); w->s.mb_width, w->s.mb_height);
} }