diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2013-03-26 17:00:21 +0200 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-04-19 23:29:22 +0300 |
| commit | c443117f25e034c1e3ef35334b61b937e1e208ff (patch) | |
| tree | 4f5856e6a47c58687cbe08863ea4486f313e7ad0 | |
| parent | 54cd5e4f92de6bd0fb8e24069153b0156c8136bc (diff) | |
| download | ffmpeg-c443117f25e034c1e3ef35334b61b937e1e208ff.tar.gz | |
dsputil: Remove dct_bits
dct_bits is never set except in h264, where it is never used,
thus remove it.
Signed-off-by: Martin Storsjö <martin@martin.st>
| -rw-r--r-- | libavcodec/dsputil.c | 12 | ||||
| -rw-r--r-- | libavcodec/dsputil.h | 5 | ||||
| -rw-r--r-- | libavcodec/h264.c | 1 |
3 files changed, 2 insertions, 16 deletions
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c index 708fbd9835..999b133bdf 100644 --- a/libavcodec/dsputil.c +++ b/libavcodec/dsputil.c @@ -2736,18 +2736,10 @@ av_cold void ff_dsputil_init(DSPContext* c, AVCodecContext *avctx) switch (avctx->bits_per_raw_sample) { case 9: - if (c->dct_bits == 32) { - BIT_DEPTH_FUNCS(9, _32); - } else { - BIT_DEPTH_FUNCS(9, _16); - } + BIT_DEPTH_FUNCS(9, _16); break; case 10: - if (c->dct_bits == 32) { - BIT_DEPTH_FUNCS(10, _32); - } else { - BIT_DEPTH_FUNCS(10, _16); - } + BIT_DEPTH_FUNCS(10, _16); break; default: BIT_DEPTH_FUNCS(8, _16); diff --git a/libavcodec/dsputil.h b/libavcodec/dsputil.h index 105305664e..029591b171 100644 --- a/libavcodec/dsputil.h +++ b/libavcodec/dsputil.h @@ -125,11 +125,6 @@ void ff_init_scantable_permutation(uint8_t *idct_permutation, * DSPContext. */ typedef struct DSPContext { - /** - * Size of DCT coefficients. - */ - int dct_bits; - /* pixel ops : interface with DCT */ 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); diff --git a/libavcodec/h264.c b/libavcodec/h264.c index d8bc824d5c..56ac57b20a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -2912,7 +2912,6 @@ static int h264_set_parameter_from_sps(H264Context *h) 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, h->sps.chroma_format_idc); - h->dsp.dct_bits = h->sps.bit_depth_luma > 8 ? 32 : 16; if (CONFIG_ERROR_RESILIENCE) ff_dsputil_init(&h->dsp, h->avctx); ff_videodsp_init(&h->vdsp, h->sps.bit_depth_luma); |