diff options
| author | James Almer <jamrial@gmail.com> | 2017-10-21 21:27:03 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2017-10-21 21:27:03 +0300 |
| commit | 0ed61546c4594480b7c09a0c79da24d78968fbf0 (patch) | |
| tree | 60791ccb8343a46db69efe6e89d53c66dfadd06b /libavfilter/avfilter.c | |
| parent | ea049ad862a4b2b398bbdade5af36291d786e02d (diff) | |
| parent | 88fd836a015a5f3380df74592e440e7d1e5b8000 (diff) | |
Merge commit '88fd836a015a5f3380df74592e440e7d1e5b8000'
* commit '88fd836a015a5f3380df74592e440e7d1e5b8000':
lavfi: Drop deprecated way of passing options for a few filters
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavfilter/avfilter.c')
| -rw-r--r-- | libavfilter/avfilter.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index f0f849b326..a08895dacf 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -996,7 +996,7 @@ int avfilter_init_str(AVFilterContext *filter, const char *args) return AVERROR(EINVAL); } -#if FF_API_OLD_FILTER_OPTS || FF_API_OLD_FILTER_OPTS_ERROR +#if FF_API_OLD_FILTER_OPTS_ERROR if ( !strcmp(filter->filter->name, "format") || !strcmp(filter->filter->name, "noformat") || !strcmp(filter->filter->name, "frei0r") || @@ -1056,14 +1056,6 @@ int avfilter_init_str(AVFilterContext *filter, const char *args) while ((p = strchr(p, ':'))) *p++ = '|'; -#if FF_API_OLD_FILTER_OPTS - if (deprecated) - av_log(filter, AV_LOG_WARNING, "This syntax is deprecated. Use " - "'|' to separate the list items.\n"); - - av_log(filter, AV_LOG_DEBUG, "compat: called with args=[%s]\n", copy); - ret = process_options(filter, &options, copy); -#else if (deprecated) { av_log(filter, AV_LOG_ERROR, "This syntax is deprecated. Use " "'|' to separate the list items ('%s' instead of '%s')\n", @@ -1072,7 +1064,6 @@ int avfilter_init_str(AVFilterContext *filter, const char *args) } else { ret = process_options(filter, &options, copy); } -#endif av_freep(©); if (ret < 0) |