[FFmpeg-cvslog] ffmpeg: Fix null pointer dereference in do_video_out()

Michael Niedermayer git at videolan.org
Sun Apr 19 23:45:24 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 19 22:42:54 2015 +0200| [93db2708d3b0bcc1f1d87d23ae8adbedd8ea6660] | committer: Michael Niedermayer

ffmpeg: Fix null pointer dereference in do_video_out()

Fixes: CID1295087

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=93db2708d3b0bcc1f1d87d23ae8adbedd8ea6660
---

 ffmpeg.c |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/ffmpeg.c b/ffmpeg.c
index 8d2cbe3..1ba0a42 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



More information about the ffmpeg-cvslog mailing list