diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:15:51 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 12:15:51 +0100 |
| commit | 35e63f35b0e34a006fc2d2ce99fae8d1d314b322 (patch) | |
| tree | 12cc143a3031cf093fa3b20d9f5f76196cd75c78 | |
| parent | 3bfb7a2537cf4d876d9c29df08da522573fc0ebc (diff) | |
| parent | 416847d19593e87ee1704c26a9a638fd6b0d977c (diff) | |
| download | ffmpeg-35e63f35b0e34a006fc2d2ce99fae8d1d314b322.tar.gz | |
Merge commit '416847d19593e87ee1704c26a9a638fd6b0d977c' into release/2.2
* commit '416847d19593e87ee1704c26a9a638fd6b0d977c':
vf_frei0r: prevent a segfault when filter parameters are not set
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavfilter/vf_frei0r.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libavfilter/vf_frei0r.c b/libavfilter/vf_frei0r.c index dbf3398986..fe02afb0b6 100644 --- a/libavfilter/vf_frei0r.c +++ b/libavfilter/vf_frei0r.c @@ -479,6 +479,10 @@ static int source_config_props(AVFilterLink *outlink) av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance\n"); return AVERROR(EINVAL); } + if (!s->params) { + av_log(ctx, AV_LOG_ERROR, "frei0r filter parameters not set.\n"); + return AVERROR(EINVAL); + } return set_params(ctx, s->params); } |