Mercurial > libavcodec.hg

comparison h264.c @ 7317:c010b69e12eb libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove apparently unneeded out!=NULL check.
author michael
date Sat, 19 Jul 2008 11:57:29 +0000
parents cf1b80029862
children cd231f79c52b
comparison
equal deleted inserted replaced
7316:cf1b80029862 7317:c010b69e12eb
7854 7854
7855 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames) 7855 if(h->sps.bitstream_restriction_flag && s->avctx->has_b_frames >= h->sps.num_reorder_frames)
7856 { } 7856 { }
7857 else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15) 7857 else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15)
7858 || (s->low_delay && 7858 || (s->low_delay &&
7859 ((!cross_idr && out && out->poc > h->outputed_poc + 2) 7859 ((!cross_idr && out->poc > h->outputed_poc + 2)
7860 || cur->pict_type == FF_B_TYPE))) 7860 || cur->pict_type == FF_B_TYPE)))
7861 { 7861 {
7862 s->low_delay = 0; 7862 s->low_delay = 0;
7863 s->avctx->has_b_frames++; 7863 s->avctx->has_b_frames++;
7864 } 7864 }