diff options
| author | Anton Khirnov <anton@khirnov.net> | 2015-01-17 17:16:20 +0100 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2015-01-27 09:07:59 +0100 |
| commit | cf1e0786ed64e69614760bfb4ecd7adbde8e6094 (patch) | |
| tree | 3f9950cdc5d877b7d21ed8de8508b75e294d7bf3 /libavcodec/h264.c | |
| parent | a7e0380497306d9723dec8440a4c52e8bf0263cf (diff) | |
error_resilience: move the MECmpContext initialization into ER code
Currently, it needs to be initialized by the ER caller (which is
currently either a mpegvideo decoder or h264dec). However, since none of
those decoders use MECmpContext for anything except ER, it makes more
sense to handle it purely inside ER.
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 684c78fcdc..f9667517d7 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -490,7 +490,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; @@ -619,8 +618,6 @@ av_cold int ff_h264_decode_init(AVCodecContext *avctx) h->dequant_coeff_pps = -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)); @@ -1231,8 +1228,6 @@ int ff_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) - 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", |