virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

Merge commit '62549f9655c48f0ec061087fa33a96040ce01145'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer 2013-04-11 10:34:05 +02:00
commit c7b0a84e1f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/avfilter.c
View File

@ -758,7 +758,13 @@ int avfilter_init_filter(AVFilterContext *filter, const char *args, void *opaque
args = NULL; 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 FF_API_OLD_FILTER_OPTS
if (!strcmp(filter->filter->name, "scale") && if (!strcmp(filter->filter->name, "scale") &&
strchr(args, ':') < strchr(args, '=')) { strchr(args, ':') < strchr(args, '=')) {