diff options
| author | Clément Bœsch <u@pkh.me> | 2016-07-09 14:06:11 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2016-07-09 14:06:11 +0200 |
| commit | b4abf0e396d8978439c0676f62780abe5a5e64dc (patch) | |
| tree | 617c02d695adc4cb869f418ebeba9f46a87125df | |
| parent | 775389fc59bc46ac00babc1baf35e273e65f8541 (diff) | |
| parent | a833ff68f6bf9dc72c3ef0ddf830ebed743c0703 (diff) | |
| download | ffmpeg-b4abf0e396d8978439c0676f62780abe5a5e64dc.tar.gz | |
Merge commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703'
* commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703':
h264: Fix decoding delay for Intra only streams
Merged-by: Clément Bœsch <u@pkh.me>
| -rw-r--r-- | libavcodec/h264_ps.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_ps.c b/libavcodec/h264_ps.c index 1e1e793380..3bcc6e15b3 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) { |