Mercurial > libavcodec.hg
comparison h264.c @ 7320:927ac918cddb libavcodec
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.
author | michael |
---|---|
date | Sat, 19 Jul 2008 15:37:52 +0000 |
parents | cd231f79c52b |
children | af725308adf4 |
comparison
equal
deleted
inserted
replaced
7319:d0937cc65db3 | 7320:927ac918cddb |
---|---|
7860 | 7860 |
7861 out_of_order = !cross_idr && out->poc < h->outputed_poc; | 7861 out_of_order = !cross_idr && out->poc < h->outputed_poc; |
7862 | 7862 |
7863 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames) | 7863 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames) |
7864 { } | 7864 { } |
7865 else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15) | 7865 else if((out_of_order && pics-1 == s->avctx->has_b_frames && s->avctx->has_b_frames < MAX_DELAYED_PIC_COUNT) |
7866 || (s->low_delay && | 7866 || (s->low_delay && |
7867 ((!cross_idr && out->poc > h->outputed_poc + 2) | 7867 ((!cross_idr && out->poc > h->outputed_poc + 2) |
7868 || cur->pict_type == FF_B_TYPE))) | 7868 || cur->pict_type == FF_B_TYPE))) |
7869 { | 7869 { |
7870 s->low_delay = 0; | 7870 s->low_delay = 0; |