OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7a994d7
)
avcodec/mpeg12dec: Don't create side data when current picture ptr is NULL.
author
Tomer Barletz
<barletz@gmail.com>
Sun, 15 Dec 2013 08:18:05 +0000
(
00:18
-0800)
committer
Michael Niedermayer
<michaelni@gmx.at>
Mon, 16 Dec 2013 02:25:44 +0000
(
03:25
+0100)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mpeg12dec.c
patch
|
blob
|
history
diff --git
a/libavcodec/mpeg12dec.c
b/libavcodec/mpeg12dec.c
index
e50f518
..
653e78c
100644
(file)
--- 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;