From: Ronald S. Bultje <rsbultje@gmail.com>
Date: Thu, 1 Dec 2011 20:45:10 +0000 (-0800)
Subject: h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.
X-Git-Tag: n0.9~44^2~93
X-Git-Url: http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/2574f08d4c30b37e39650a3b3d1970f75f3170cd

h264: cap max has_b_frames at MAX_DELAYED_PIC_COUNT - 1.

This prevents frame allocation overflows, and fixed
fate-h264-conformance-mr3_tandberg_b with 2 threads.
---

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index ad1ab69..96062b7 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -1438,7 +1438,7 @@ static void decode_postinit(H264Context *h, int setup_finished){
 
     if(   s->avctx->strict_std_compliance >= FF_COMPLIANCE_STRICT
        && !h->sps.bitstream_restriction_flag){
-        s->avctx->has_b_frames= MAX_DELAYED_PIC_COUNT;
+        s->avctx->has_b_frames = MAX_DELAYED_PIC_COUNT - 1;
         s->low_delay= 0;
     }