virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

ffmpeg: avoid NULL dereference with filters.

Browse Source 
icodec can be NULL if there is no input stream
clearly associated with the output stream.
This commit is contained in:
Nicolas George
2012-05-23 21:19:16 +02:00
parent eb7efc126a
commit 48b5bcb3dd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg.c
View File

@@ -3103,7 +3103,8 @@ static int transcode_init(void)
ost->filter->filter->inputs[0]->sample_aspect_ratio; ost->filter->filter->inputs[0]->sample_aspect_ratio;
codec->pix_fmt = ost->filter->filter->inputs[0]->format; 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->height != icodec->height ||
codec->pix_fmt != icodec->pix_fmt) { codec->pix_fmt != icodec->pix_fmt) {
codec->bits_per_raw_sample = frame_bits_per_raw_sample; codec->bits_per_raw_sample = frame_bits_per_raw_sample;