aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-04-19 22:42:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-04-19 23:44:19 +0200
commit93db2708d3b0bcc1f1d87d23ae8adbedd8ea6660 (patch)
treebf0ce9bba3a48d0d653697ffa20742dbae550d1c /ffmpeg.c
parent0cab0931dcf23e3ac111649b16a5efadf7285ac6 (diff)
downloadffmpeg-93db2708d3b0bcc1f1d87d23ae8adbedd8ea6660.tar.gz
ffmpeg: Fix null pointer dereference in do_video_out()
Fixes: CID1295087 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
-rw-r--r--ffmpeg.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/ffmpeg.c b/ffmpeg.c
index 8d2cbe3cef..1ba0a42058 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -1031,6 +1031,9 @@ static void do_video_out(AVFormatContext *s,
} else
in_picture = next_picture;
+ if (!in_picture)
+ return;
+
in_picture->pts = ost->sync_opts;
#if 1