diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 10:34:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-04-11 10:34:05 +0200 |
| commit | c7b0a84e1fe1ba4415d5d578ddb9532d379201cf (patch) | |
| tree | b727284ea95b2c33c99eec287a636fb8aa16aa5e /libavfilter/avfilter.c | |
| parent | 31428240ec1ee163424822bb0a1042bd70182da2 (diff) | |
| parent | 62549f9655c48f0ec061087fa33a96040ce01145 (diff) | |
Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'
* commit '62549f9655c48f0ec061087fa33a96040ce01145':
lavfi: error out when options are provided to a filter that does not take any
Conflicts:
libavfilter/avfilter.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index ba6f414bf2..e96c8f2381 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -758,7 +758,13 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque args = NULL; } - if (anton_options && args && *args && filter->filter->priv_class) { + if (anton_options && args && *args) { + if (!filter->filter->priv_class) { + av_log(filter, AV_LOG_ERROR, "This filter does not take any " + "options, but options were provided: %s.\n", args); + return AVERROR(EINVAL); + } + #if FF_API_OLD_FILTER_OPTS if (!strcmp(filter->filter->name, "scale") && strchr(args, ':') < strchr(args, '=')) { |