From 801b27fa7cc2d97d6afdc2b899b520288f240299 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 19 Jul 2008 11:57:29 +0000 Subject: [PATCH] Remove apparently unneeded out!=NULL check. Originally committed as revision 14299 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 7e2b0581b3..6445b1c2ce 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7856,7 +7856,7 @@ static int decode_frame(AVCodecContext *avctx, { } else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15) || (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))) { s->low_delay = 0;