aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-10-03 20:09:46 -0300
committerJames Almer <jamrial@gmail.com>2017-10-03 20:09:46 -0300
commit73c85d3af2420baeee9a8f0429b34012096606ea (patch)
tree1785c307700ef902b60aae123bb0ad0561b9dab2
parentcbbec68847ed3485900e83ec231871f71bb97d0d (diff)
parent248dc5c1646dcdd96fe79761105c4ae889e711fd (diff)
downloadffmpeg-73c85d3af2420baeee9a8f0429b34012096606ea.tar.gz
Merge commit '248dc5c1646dcdd96fe79761105c4ae889e711fd'
* commit '248dc5c1646dcdd96fe79761105c4ae889e711fd': h264dec: fix dropped initial SEI recovery point Merged-by: James Almer <jamrial@gmail.com>
-rw-r--r--libavcodec/h264dec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264dec.c b/libavcodec/h264dec.c
index 49ebeca6d8..f29c3f9048 100644
--- a/libavcodec/h264dec.c
+++ b/libavcodec/h264dec.c
@@ -499,7 +499,6 @@ void ff_h264_flush_change(H264Context *h)
ff_h264_unref_picture(h, &h->last_pic_for_ec);
h->first_field = 0;
- ff_h264_sei_uninit(&h->sei);
h->recovery_frame = -1;
h->frame_recovered = 0;
h->current_slice = 0;
@@ -515,6 +514,7 @@ static void flush_dpb(AVCodecContext *avctx)
memset(h->delayed_pic, 0, sizeof(h->delayed_pic));
ff_h264_flush_change(h);
+ ff_h264_sei_uninit(&h->sei);
for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
ff_h264_unref_picture(h, &h->DPB[i]);