diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 12:50:45 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-04 13:17:25 +0100 |
| commit | bfe03205a86c63edd4246a51f70284a2874ea352 (patch) | |
| tree | d63fbed9d91c365ee503a0dc35a99584c40397a7 | |
| parent | 2b0ff8d6424fa8e5c8dd69e9176be07b40e035ab (diff) | |
| parent | 4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e (diff) | |
| download | ffmpeg-bfe03205a86c63edd4246a51f70284a2874ea352.tar.gz | |
Merge commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e'
* commit '4e0be9c86f2003dd3ba2eb8fad01e8d0e538075e':
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 b042ac094a..9f868383ee 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); } |