virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-28 20:53:54 +02:00
Code Issues Releases Activity

Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'

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

Conflicts:
	libavfilter/avfilter.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-25 03:08:19 +02:00
commit 1945db1f13
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

@ -227,6 +227,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;