Commit 73c85d3a authored by James Almer's avatar James Almer

Merge commit '248dc5c1'

* commit '248dc5c1':
  h264dec: fix dropped initial SEI recovery point
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents cbbec688 248dc5c1
...@@ -499,7 +499,6 @@ void ff_h264_flush_change(H264Context *h) ...@@ -499,7 +499,6 @@ void ff_h264_flush_change(H264Context *h)
ff_h264_unref_picture(h, &h->last_pic_for_ec); ff_h264_unref_picture(h, &h->last_pic_for_ec);
h->first_field = 0; h->first_field = 0;
ff_h264_sei_uninit(&h->sei);
h->recovery_frame = -1; h->recovery_frame = -1;
h->frame_recovered = 0; h->frame_recovered = 0;
h->current_slice = 0; h->current_slice = 0;
...@@ -515,6 +514,7 @@ static void flush_dpb(AVCodecContext *avctx) ...@@ -515,6 +514,7 @@ static void flush_dpb(AVCodecContext *avctx)
memset(h->delayed_pic, 0, sizeof(h->delayed_pic)); memset(h->delayed_pic, 0, sizeof(h->delayed_pic));
ff_h264_flush_change(h); ff_h264_flush_change(h);
ff_h264_sei_uninit(&h->sei);
for (i = 0; i < H264_MAX_PICTURE_COUNT; i++) for (i = 0; i < H264_MAX_PICTURE_COUNT; i++)
ff_h264_unref_picture(h, &h->DPB[i]); ff_h264_unref_picture(h, &h->DPB[i]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment