From 56c70e1d3a1cde2f7490780a4924e6b6e87e4c47 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Sat, 3 Mar 2007 21:33:33 +0000 Subject: [PATCH] check for no frame and prevent segfault Originally committed as revision 8211 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/h264.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavcodec/h264.c b/libavcodec/h264.c index 9c568c0033..10beead96a 100644 --- a/libavcodec/h264.c +++ b/libavcodec/h264.c @@ -8355,6 +8355,11 @@ static int decode_frame(AVCodecContext *avctx, if(buf_index < 0) return -1; + if(!(s->flags2 & CODEC_FLAG2_CHUNKS) && !s->current_picture_ptr){ + av_log(avctx, AV_LOG_ERROR, "no frame!\n"); + return -1; + } + if(!(s->flags2 & CODEC_FLAG2_CHUNKS) || (s->mb_y >= s->mb_height && s->mb_height)){ Picture *out = s->current_picture_ptr; Picture *cur = s->current_picture_ptr;