Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mpc-hc/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomer Barletz <barletz@gmail.com>2013-12-15 12:18:05 +0400
committerHendrik Leppkes <h.leppkes@gmail.com>2014-01-14 13:25:56 +0400
commitda1db1a39da0741b0ee340ef23062810c39b29fd (patch)
treea8b3a902ba38f8429932385890ffe281ca67a91f
parentda162975c1f82548b80eed82b860b1cbaab2ef9f (diff)
avcodec/mpeg12dec: Don't create side data when current picture ptr is NULL.mpc-hc-1.7.2-7lav0.60.1
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mpeg12dec.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
index 1fc55b000e..e3d62c9e2a 100644
--- a/libavcodec/mpeg12dec.c
+++ b/libavcodec/mpeg12dec.c
@@ -2229,7 +2229,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;