dct_bits is never set except in h264, where it is never used, thus remove it. Signed-off-by: Martin Storsjö <martin@martin.st>tags/n2.0
@@ -2736,18 +2736,10 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) | |||||
switch (avctx->bits_per_raw_sample) { | switch (avctx->bits_per_raw_sample) { | ||||
case 9: | case 9: | ||||
if (c->dct_bits == 32) { | |||||
BIT_DEPTH_FUNCS(9, _32); | |||||
} else { | |||||
BIT_DEPTH_FUNCS(9, _16); | |||||
} | |||||
BIT_DEPTH_FUNCS(9, _16); | |||||
break; | break; | ||||
case 10: | case 10: | ||||
if (c->dct_bits == 32) { | |||||
BIT_DEPTH_FUNCS(10, _32); | |||||
} else { | |||||
BIT_DEPTH_FUNCS(10, _16); | |||||
} | |||||
BIT_DEPTH_FUNCS(10, _16); | |||||
break; | break; | ||||
default: | default: | ||||
BIT_DEPTH_FUNCS(8, _16); | BIT_DEPTH_FUNCS(8, _16); | ||||
@@ -125,11 +125,6 @@ void ff_init_scantable_permutation(uint8_t *idct_permutation, | |||||
* DSPContext. | * DSPContext. | ||||
*/ | */ | ||||
typedef struct DSPContext { | typedef struct DSPContext { | ||||
/** | |||||
* Size of DCT coefficients. | |||||
*/ | |||||
int dct_bits; | |||||
/* pixel ops : interface with DCT */ | /* pixel ops : interface with DCT */ | ||||
void (*get_pixels)(int16_t *block/*align 16*/, const uint8_t *pixels/*align 8*/, int line_size); | void (*get_pixels)(int16_t *block/*align 16*/, const uint8_t *pixels/*align 8*/, int line_size); | ||||
void (*diff_pixels)(int16_t *block/*align 16*/, const uint8_t *s1/*align 8*/, const uint8_t *s2/*align 8*/, int stride); | void (*diff_pixels)(int16_t *block/*align 16*/, const uint8_t *s1/*align 8*/, const uint8_t *s2/*align 8*/, int stride); | ||||
@@ -2912,7 +2912,6 @@ static int h264_set_parameter_from_sps(H264Context *h) | |||||
ff_h264qpel_init(&h->h264qpel, h->sps.bit_depth_luma); | ff_h264qpel_init(&h->h264qpel, h->sps.bit_depth_luma); | ||||
ff_h264_pred_init(&h->hpc, h->avctx->codec_id, h->sps.bit_depth_luma, | ff_h264_pred_init(&h->hpc, h->avctx->codec_id, h->sps.bit_depth_luma, | ||||
h->sps.chroma_format_idc); | h->sps.chroma_format_idc); | ||||
h->dsp.dct_bits = h->sps.bit_depth_luma > 8 ? 32 : 16; | |||||
if (CONFIG_ERROR_RESILIENCE) | if (CONFIG_ERROR_RESILIENCE) | ||||
ff_dsputil_init(&h->dsp, h->avctx); | ff_dsputil_init(&h->dsp, h->avctx); | ||||
ff_videodsp_init(&h->vdsp, h->sps.bit_depth_luma); | ff_videodsp_init(&h->vdsp, h->sps.bit_depth_luma); | ||||