diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 03:08:19 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-25 03:08:19 +0200 |
| commit | 1945db1f13071aced7fcb25573980540c19156ea (patch) | |
| tree | a7f4f8d1dc84fe8fa56ad426154eb23b569c0e63 | |
| parent | 4ef02ddd818857e479c90bca85894a5a2e1bea9d (diff) | |
| parent | ac84c1ce24a285f9cf16d4297bce73b1c4a6e435 (diff) | |
| download | ffmpeg-1945db1f13071aced7fcb25573980540c19156ea.tar.gz | |
Merge commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435'
* commit 'ac84c1ce24a285f9cf16d4297bce73b1c4a6e435':
avfilter: check filter link validity
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/avfilter.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 3805912828..963f5e6479 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -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; |