[FFmpeg-cvslog] r14302 - trunk/libavcodec/h264.c

[michael]

Author: michael
Date: Sat Jul 19 17:37:52 2008
New Revision: 14302

Log:
Make the automatic has_b_frames increasing code increase it up to the
same maximum that can be achived by specifying the value in the bitstream.


Modified:
   trunk/libavcodec/h264.c

Modified: trunk/libavcodec/h264.c
==============================================================================
--- trunk/libavcodec/h264.c	(original)
+++ trunk/libavcodec/h264.c	Sat Jul 19 17:37:52 2008
@@ -7862,7 +7862,7 @@ static int decode_frame(AVCodecContext *
 
             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)))