check for no frame and prevent segfault

Originally committed as revision 8211 to svn://svn.ffmpeg.org/ffmpeg/trunk
18 years ago · 56c70e1d3a
parent 6cb8b1c364
commit 56c70e1d3a
1 changed files with 5 additions and 0 deletions
--- 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;