RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-16 11:47:04 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0' into release/2.4

Browse Source 
* commit 'a7e79f6a43bdc7e3b164dd78b060f0d5575a0cf0':
  avfilter: check filter link validity

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2015-01-18 01:11:20 +01:00
commit fefb152cd9
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavfilter/avfilter.c
View File

@ -230,6 +230,11 @@ int avfilter_config_links(AVFilterContext *filter)
AVFilterLink *inlink;
if (!link) continue;
if (!link->src || !link->dst) {
av_log(filter, AV_LOG_ERROR,
"Not all input and output are properly linked (%d).\n", i);
return AVERROR(EINVAL);
}
inlink = link->src->nb_inputs ? link->src->inputs[0] : NULL;
link->current_pts = AV_NOPTS_VALUE;