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

Remove apparently unneeded out!=NULL check. 

Originally committed as revision 14299 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2008-07-19 11:57:29 +00:00
parent 3eaa6d0e56
commit 801b27fa7c
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/h264.c
View File

@ -7856,7 +7856,7 @@ static int decode_frame(AVCodecContext *avctx,
{ } { }
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 && pics < 15)
|| (s->low_delay && || (s->low_delay &&
((!cross_idr && out && out->poc > h->outputed_poc + 2) ((!cross_idr && out->poc > h->outputed_poc + 2)
|| cur->pict_type == FF_B_TYPE))) || cur->pict_type == FF_B_TYPE)))
{ {
s->low_delay = 0; s->low_delay = 0;