highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit '416847d19593e87ee1704c26a9a638fd6b0d977c' into release/2.2

Browse Source 
* commit '416847d19593e87ee1704c26a9a638fd6b0d977c':
  vf_frei0r: prevent a segfault when filter parameters are not set

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-03-11 12:15:51 +01:00
parent 3bfb7a2537 416847d195
commit 35e63f35b0
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/vf_frei0r.c
View File

@@ -479,6 +479,10 @@ static int source_config_props(AVFilterLink *outlink)
av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance\n"); av_log(ctx, AV_LOG_ERROR, "Impossible to load frei0r instance\n");
return AVERROR(EINVAL); 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); return set_params(ctx, s->params);
} }