From 48b5bcb3dd42bb0018850f41f7e090418e1b0dfb Mon Sep 17 00:00:00 2001
From: Nicolas George <nicolas.george@normalesup.org>
Date: Wed, 23 May 2012 21:19:16 +0200
Subject: ffmpeg: avoid NULL dereference with filters.

icodec can be NULL if there is no input stream
clearly associated with the output stream.
---
 ffmpeg.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'ffmpeg.c')

diff --git a/ffmpeg.c b/ffmpeg.c
index 56c961b9e0..b226779d63 100644
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -3103,7 +3103,8 @@ static int transcode_init(void)
                     ost->filter->filter->inputs[0]->sample_aspect_ratio;
                 codec->pix_fmt = ost->filter->filter->inputs[0]->format;
 
-                if (codec->width   != icodec->width  ||
+                if (!icodec ||
+                    codec->width   != icodec->width  ||
                     codec->height  != icodec->height ||
                     codec->pix_fmt != icodec->pix_fmt) {
                     codec->bits_per_raw_sample = frame_bits_per_raw_sample;
-- 
cgit v1.2.3