From 08b1d1d8122517d07f2335437cde0aeedc50143f Mon Sep 17 00:00:00 2001 From: John Stebbins Date: Wed, 27 Jun 2018 15:12:24 -0700 Subject: [PATCH] h264_slice: Fix return of incomplete frames from decoder When not using libavformat for demuxing, AVCodecContext.has_b_frames gets set too late causing the recovery frame heuristic in h264_refs to incorrectly flag an early frame as recovered. This patch sets has_b_frames earlier to prevent improperly flagging the frame as recovered. Signed-off-by: Michael Niedermayer --- libavcodec/h264_slice.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c index d71ddbe9ba..ede9a1a6ea 100644 --- a/libavcodec/h264_slice.c +++ b/libavcodec/h264_slice.c @@ -1407,6 +1407,11 @@ static int h264_field_start(H264Context *h, const H264SliceContext *sl, sps = h->ps.sps; + if (sps && sps->bitstream_restriction_flag && + h->avctx->has_b_frames < sps->num_reorder_frames) { + h->avctx->has_b_frames = sps->num_reorder_frames; + } + last_pic_droppable = h->droppable; last_pic_structure = h->picture_structure; h->droppable = (nal->ref_idc == 0);