diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 12:00:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 12:00:05 +0200 |
| commit | 65120f628ca5facb8ae5e14d923ed31218bc9409 (patch) | |
| tree | 5e5b04cf5ee5a22562524da3bc07184bb60d253e /libavcodec | |
| parent | a87e85fa722e34639fe53d64586faa309f51afcc (diff) | |
| parent | 85deb51a01f1ecc5ac5faa52ad8ea141c384e23a (diff) | |
| download | ffmpeg-65120f628ca5facb8ae5e14d923ed31218bc9409.tar.gz | |
Merge commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a'
* commit '85deb51a01f1ecc5ac5faa52ad8ea141c384e23a':
h264: Only initialize dsputil if error resilience is enabled
Conflicts:
libavcodec/h264.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/h264.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 3b3bfac026..b4df424f5b 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1476,10 +1476,9 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) h->dequant_coeff_pps = -1; - if (CONFIG_ERROR_RESILIENCE) { - /* needed so that IDCT permutation is known early */ + /* needed so that IDCT permutation is known early */ + 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)); @@ -2960,9 +2959,9 @@ 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); - if (CONFIG_ERROR_RESILIENCE) { + + 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", |