From cd19c677cb5dcaecc472c021bd38370817740a5e Mon Sep 17 00:00:00 2001 From: Loren Merritt Date: Thu, 27 Oct 2005 21:03:36 +0000 Subject: fix a crash on dropped frames Originally committed as revision 4667 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libavcodec') diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 560782df7d..08687dc1aa 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -7672,7 +7672,7 @@ static int decode_frame(AVCodecContext *avctx, out_of_order = !cross_idr && prev && out->poc < prev->poc; if(prev && pics <= s->avctx->has_b_frames) out = prev; - else if((out_of_order && pics-1 == s->avctx->has_b_frames) + else if((out_of_order && pics-1 == s->avctx->has_b_frames && pics < 15) || (s->low_delay && ((!cross_idr && prev && out->poc > prev->poc + 2) || cur->pict_type == B_TYPE))) -- cgit v1.2.3