diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-07-19 15:37:52 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-07-19 15:37:52 +0000 |
| commit | 2a811db23869348624a7404f60de8461447d6d51 (patch) | |
| tree | c5d9d5b69220ac7d122d8858b8efb78c5598afcb | |
| parent | 6bc5714be67b92086dff74318f8b5c5e74969b5c (diff) | |
| download | ffmpeg-2a811db23869348624a7404f60de8461447d6d51.tar.gz | |
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
| -rw-r--r-- | libavcodec/h264.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 1fe76671c2..2e7b1cddaf 100644 --- 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))) |