eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-06-16 04:32:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '88fd836a015a5f3380df74592e440e7d1e5b8000'

Browse Source 
* commit '88fd836a015a5f3380df74592e440e7d1e5b8000':
  lavfi: Drop deprecated way of passing options for a few filters

Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2017-10-21 15:27:03 -03:00
parent ea049ad862 88fd836a01
commit 0ed61546c4
6 changed files with 1 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libavfilter/avfilter.c
+1 -10
View File
@@ -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(&copy);
if (ret < 0)