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>

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, '=')) {