diff options
| author | Dale Curtis <dalecurtis@chromium.org> | 2014-01-02 14:29:38 -0800 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-03 00:44:29 +0100 |
| commit | 33aa2c5d6b22df74ec508c24bbb9cb1b4feec787 (patch) | |
| tree | a3a270b6c06aa7aa3ddfa20e3e3af47aec626588 | |
| parent | b4552cc9b8c37410f754af5d34d24e7b8a9b4b0e (diff) | |
| download | ffmpeg-33aa2c5d6b22df74ec508c24bbb9cb1b4feec787.tar.gz | |
h264: Clear ERContext.cur_pic when unref'ing current picture.
Signed-off-by: Dale Curtis <dalecurtis@chromium.org>
(cherry picked from commit 4feca2214a0b69dcbe4d1c7cd145c3881459e867)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/h264.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index a5c2147fc2..9111d923d2 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -1847,6 +1847,10 @@ static int h264_frame_start(H264Context *h) h->cur_pic_ptr = pic; unref_picture(h, &h->cur_pic); + if (CONFIG_ERROR_RESILIENCE) { + h->er.cur_pic = NULL; + } + if ((ret = ref_picture(h, &h->cur_pic, h->cur_pic_ptr)) < 0) return ret; |