Merge commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703'
authorClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:06:11 +0000 (14:06 +0200)
committerClément Bœsch <u@pkh.me>
Sat, 9 Jul 2016 12:06:11 +0000 (14:06 +0200)
* commit 'a833ff68f6bf9dc72c3ef0ddf830ebed743c0703':
  h264: Fix decoding delay for Intra only streams

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/h264_ps.c

index 1e1e793..3bcc6e1 100644 (file)
@@ -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) {