Module: libav Branch: master Commit: 85deb51a01f1ecc5ac5faa52ad8ea141c384e23a
Author: Ronald S. Bultje <[email protected]> Committer: Martin Storsjö <[email protected]> Date: Tue Mar 26 16:43:57 2013 +0200 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ö <[email protected]> --- libavcodec/h264.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 7d7f376..4a3d2e7 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -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", _______________________________________________ libav-commits mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-commits
