diff options
author | Nicolas George <nicolas.george@normalesup.org> | 2012-05-23 21:19:16 +0200 |
---|---|---|
committer | Nicolas George <nicolas.george@normalesup.org> | 2012-06-03 23:43:57 +0200 |
commit | 48b5bcb3dd42bb0018850f41f7e090418e1b0dfb (patch) | |
tree | c83067f5f67eadd35da592ef559683a57fbdad52 | |
parent | eb7efc126aed1947edcba81c2d1a9bf776206f5c (diff) | |
download | ffmpeg-48b5bcb3dd42bb0018850f41f7e090418e1b0dfb.tar.gz |
ffmpeg: avoid NULL dereference with filters.
icodec can be NULL if there is no input stream
clearly associated with the output stream.
-rw-r--r-- | ffmpeg.c | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -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; |