From fe285b04bbad23ddfac164e22034b5ee76e039a6 Mon Sep 17 00:00:00 2001
From: Tomer Barletz <barletz@gmail.com>
Date: Sun, 15 Dec 2013 00:18:05 -0800
Subject: [PATCH] avcodec/mpeg12dec: Don't create side data when current
picture ptr is NULL.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/mpeg12dec.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index e50f518436d..653e78c3011 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2226,7 +2226,11 @@ static void mpeg_decode_user_data(AVCodecContext *avctx,
S3D_video_format_type == 0x23) {
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
- AVStereo3D *stereo = av_stereo3d_create_side_data(&s->current_picture_ptr->f);
+ AVStereo3D *stereo;
+ if (!s->current_picture_ptr)
+ return;
+
+ stereo = av_stereo3d_create_side_data(&s->current_picture_ptr->f);
if (!stereo)
return;
--
GitLab