summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDale Curtis <[email protected]>2014-01-02 14:29:38 -0800
committerMichael Niedermayer <[email protected]>2014-01-02 23:49:06 +0100
commit4feca2214a0b69dcbe4d1c7cd145c3881459e867 (patch)
tree2126cc47af72e4aca5e6d12df3561eb420caee83
parent2e59ffbb7964214e192a9f77c4445ff29c6510d7 (diff)
h264: Clear ERContext.cur_pic when unref'ing current picture.
Signed-off-by: Dale Curtis <[email protected]>
-rw-r--r--libavcodec/h264.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index c55e11c40f..d125f54a03 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1972,6 +1972,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;