summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-03-14 06:44:18 -0700
committerMichael Niedermayer <michaelni@gmx.at>2013-03-14 14:56:48 +0100
commit4a88d81c9e3758dfad6bf35681e27b9c10f0b346 (patch)
tree50f0002cde9885d60405d73ad0d91b222d3e704e /libavcodec/h264.c
parent49a514c13e148a4c0984e5c03262ced69575b620 (diff)
dsputil: remove duplicate or unused functions.
dct_bits is never set except in h264, where it is never used, thus remove it. Then, remove all functions that were set based on non-zero (32) values for dct_bits. Lastly, merge 9-14 bpp functions for get_pixels and draw_edge, which only care about pixel storage unit size, not actual bits used (i.e. they don't clip). Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index bc8ee2eead..e8140c9450 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1421,7 +1421,6 @@ static av_cold void common_init(H264Context *h)
h->dequant_coeff_pps = -1;
if (CONFIG_ERROR_RESILIENCE) {
- h->dsp.dct_bits = 16;
/* needed so that IDCT permutation is known early */
ff_dsputil_init(&h->dsp, h->avctx);
}
@@ -2973,7 +2972,6 @@ static int h264_set_parameter_from_sps(H264Context *h)
ff_h264_pred_init(&h->hpc, h->avctx->codec_id, h->sps.bit_depth_luma,
h->sps.chroma_format_idc);
if (CONFIG_ERROR_RESILIENCE) {
- h->dsp.dct_bits = h->sps.bit_depth_luma > 8 ? 32 : 16;
ff_dsputil_init(&h->dsp, h->avctx);
}
ff_videodsp_init(&h->vdsp, h->sps.bit_depth_luma);