RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2013-04-11 12:00:05 +02:00
parent a87e85fa72 85deb51a01
commit 65120f628c
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h264.c
View File

@ -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",