Browse Source

h264: Only initialize dsputil if error resilience is enabled

It is only used for error resilience. This allows building the
h264 decoder without dsputil, if error resilience is disabled.

Signed-off-by: Martin Storsjö <martin@martin.st>
tags/n2.0
Ronald S. Bultje Martin Storsjö 13 years ago
parent
commit
85deb51a01
1 changed files with 4 additions and 2 deletions
  1. +4
    -2
      libavcodec/h264.c

+ 4
- 2
libavcodec/h264.c View File

@@ -1440,7 +1440,8 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx)
h->dequant_coeff_pps = -1;

/* needed so that IDCT permutation is known early */
ff_dsputil_init(&h->dsp, h->avctx);
if (CONFIG_ERROR_RESILIENCE)
ff_dsputil_init(&h->dsp, h->avctx);
ff_videodsp_init(&h->vdsp, 8);

memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t));
@@ -2915,7 +2916,8 @@ 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);
h->dsp.dct_bits = h->sps.bit_depth_luma > 8 ? 32 : 16;
ff_dsputil_init(&h->dsp, h->avctx);
if (CONFIG_ERROR_RESILIENCE)
ff_dsputil_init(&h->dsp, h->avctx);
ff_videodsp_init(&h->vdsp, h->sps.bit_depth_luma);
} else {
av_log(h->avctx, AV_LOG_ERROR, "Unsupported bit depth: %d\n",


Loading…
Cancel
Save