From a833ff68f6bf9dc72c3ef0ddf830ebed743c0703 Mon Sep 17 00:00:00 2001 From: Anton Mitrofanov Date: Sun, 8 May 2016 13:28:00 +0200 Subject: [PATCH] h264: Fix decoding delay for Intra only streams Signed-off-by: Anton Khirnov --- libavcodec/h264_ps.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index f6cd1ca760..8d567cad25 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -530,7 +530,8 @@ int ff_h264_decode_seq_parameter_set(GetBitContext *gb, AVCodecContext *avctx, /* if the maximum delay is not stored in the SPS, derive it based on the * level */ - if (!sps->bitstream_restriction_flag) { + if (!sps->bitstream_restriction_flag && + (sps->ref_frame_count || avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT)) { sps->num_reorder_frames = MAX_DELAYED_PIC_COUNT - 1; for (i = 0; i < FF_ARRAY_ELEMS(level_max_dpb_mbs); i++) { if (level_max_dpb_mbs[i][0] == sps->level_idc) { -- 2.11.0