From: "Ronald S. Bultje" <[email protected]>
dct_bits is never set except in h264, where it is never used,
thus remove it.
---
libavcodec/dsputil.c | 12 ++----------
libavcodec/dsputil.h | 5 -----
libavcodec/h264.c | 1 -
3 files changed, 2 insertions(+), 16 deletions(-)
diff --git a/libavcodec/dsputil.c b/libavcodec/dsputil.c
index 708fbd9..999b133 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 1053056..029591b 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 4a3d2e7..40659c3 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -2915,7 +2915,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);
--
1.7.9.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
