From 6a0b5e34763c14a1e35e767f374ffb98fa64732f Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 29 Apr 2014 14:50:46 +0200 Subject: [PATCH] avcodec/mpegvideo: fix null pointer dereference Fixes: 111342.ogm with ffplay Found-by: Dale Curtis Signed-off-by: Michael Niedermayer --- libavcodec/mpegvideo.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index f2ca9b33c6..7d9da5c106 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -931,7 +931,7 @@ int ff_mpeg_update_thread_context(AVCodecContext *dst, #define UPDATE_PICTURE(pic)\ do {\ ff_mpeg_unref_picture(s, &s->pic);\ - if (s1->pic.f->buf[0])\ + if (s1->pic.f && s1->pic.f->buf[0])\ ret = ff_mpeg_ref_picture(s, &s->pic, &s1->pic);\ else\ ret = update_picture_tables(&s->pic, &s1->pic);\