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_slice.c | |
| parent | a7e0380497306d9723dec8440a4c52e8bf0263cf (diff) | |
| download | ffmpeg-cf1e0786ed64e69614760bfb4ecd7adbde8e6094.tar.gz | |
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_slice.c')
| -rw-r--r-- | libavcodec/h264_slice.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index edce30f3a5..e291aab6d6 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1112,7 +1112,6 @@ static int h264_slice_header_init(H264Context *h, int reinit) if (!c) return AVERROR(ENOMEM); c->avctx = h->avctx; - c->mecc = h->mecc; c->vdsp = h->vdsp; c->h264dsp = h->h264dsp; c->h264qpel = h->h264qpel; |