diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 2e7b1cddaf..4a02ae6795 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7836,6 +7836,12 @@ static int decode_frame(AVCodecContext *avctx,
                 s->low_delay = 0;
             }
 
+            if(   s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT
+               && !h->sps.bitstream_restriction_flag){
+                s->avctx->has_b_frames= MAX_DELAYED_PIC_COUNT;
+                s->low_delay= 0;
+            }
+
             pics = 0;
             while(h->delayed_pic[pics]) pics++;