ffmpeg | branch: master | Clément Bœsch <[email protected]> | Sat Jul 9 14:06:11 2016 +0200| [b4abf0e396d8978439c0676f62780abe5a5e64dc] | committer: Clément Bœsch
Merge commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703' * commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703': h264: Fix decoding delay for Intra only streams Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b4abf0e396d8978439c0676f62780abe5a5e64dc --- 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 1e1e793..3bcc6e1 100644 --- a/libavcodec/h264_ps.c +++ b/libavcodec/h264_ps.c @@ -560,7 +560,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) { ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
