Make the automatic has_b_frames increasing code increase it up to the

same maximum that can be achieved by specifying the value in the bitstream.

Originally committed as revision 14302 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 1fe7667..2e7b1cd 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7862,7 +7862,7 @@ static int decode_frame(AVCodecContext *avctx,
 
             if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
                 { }
-            else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15)
+            else if((out_of_order && pics-1 == s->avctx->has_b_frames && s->avctx->has_b_frames < MAX_DELAYED_PIC_COUNT)
                || (s->low_delay &&
                 ((!cross_idr && out->poc > h->outputed_poc + 2)
                  || cur->pict_type == FF_B_TYPE)))