RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

simplify 

Originally committed as revision 14291 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-07-19 03:13:11 +00:00
parent 7645da9194
commit 0ab515e935
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/h264.c
View File

@ -7855,9 +7855,6 @@ static int decode_frame(AVCodecContext *avctx,
out_of_order = !cross_idr && out->poc < h->outputed_poc;
if(pics <= s->avctx->has_b_frames || out_of_order)
out = NULL;
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)
@ -7867,9 +7864,11 @@ static int decode_frame(AVCodecContext *avctx,
{
s->low_delay = 0;
s->avctx->has_b_frames++;
out= NULL;
}
if(pics <= s->avctx->has_b_frames || out_of_order)
out = NULL;
if(out_of_order || pics > s->avctx->has_b_frames){
for(i=out_idx; h->delayed_pic[i]; i++)
h->delayed_pic[i] = h->delayed_pic[i+1];