diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 14:56:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-27 14:56:52 +0100 |
| commit | 3d0411707839d3af1f34e0a8c7c8cbe4dd02b1ba (patch) | |
| tree | b8acca47871747e129ca6b33b06ea603fd9c6a9d /libavcodec/h264.c | |
| parent | a1cdd1f08e06582c93fe66eacfc7c09e42321115 (diff) | |
| parent | cf1e0786ed64e69614760bfb4ecd7adbde8e6094 (diff) | |
Merge commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094'
* commit 'cf1e0786ed64e69614760bfb4ecd7adbde8e6094':
error_resilience: move the MECmpContext initialization into ER code
Conflicts:
libavcodec/error_resilience.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_slice.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/h264.c')
| -rw-r--r-- | libavcodec/h264.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 35473dff62..a54124cafa 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -515,7 +515,6 @@ int ff_h264_context_init(H264Context *h) if (CONFIG_ERROR_RESILIENCE) { /* init ER */ er->avctx = h->avctx; - er->mecc = &h->mecc; er->decode_mb = h264_er_decode_mb; er->opaque = h; er->quarter_sample = 1; @@ -652,8 +651,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) h->current_sps_id = -1; /* needed so that IDCT permutation is known early */ - if (CONFIG_ERROR_RESILIENCE) - ff_me_cmp_init(&h->mecc, h->avctx); ff_videodsp_init(&h->vdsp, 8); memset(h->pps.scaling_matrix4, 16, 6 * 16 * sizeof(uint8_t)); @@ -1272,8 +1269,6 @@ int ff_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) - ff_me_cmp_init(&h->mecc, 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", |