| @@ -895,7 +895,7 @@ int avfilter_init_str(AVFilterContext *filter, const char *args) · 894 unmodified lines |
| 895 | 895 | return AVERROR(EINVAL); |
| 896 | 896 | } |
| 897 | 897 | |
| 898 | | −#if FF_API_OLD_FILTER_OPTS |
| 898 | +#if FF_API_OLD_FILTER_OPTS || FF_API_OLD_FILTER_OPTS_ERROR |
| 899 | 899 | if ( !strcmp(filter->filter->name, "format") || |
| 900 | 900 | !strcmp(filter->filter->name, "noformat") || |
| 901 | 901 | !strcmp(filter->filter->name, "frei0r") || |
| @@ -955,12 +955,23 @@ int avfilter_init_str(AVFilterContext *filter, const char *args) · 53 unmodified lines |
| 955 | 955 | while ((p = strchr(p, ':'))) |
| 956 | 956 | *p++ = '|'; |
| 957 | 957 | |
| 958 | +#if FF_API_OLD_FILTER_OPTS |
| 958 | 959 | if (deprecated) |
| 959 | 960 | av_log(filter, AV_LOG_WARNING, "This syntax is deprecated. Use " |
| 960 | 961 | "'|' to separate the list items.\n"); |
| 961 | 962 | |
| 962 | 963 | av_log(filter, AV_LOG_DEBUG, "compat: called with args=[%s]\n", copy); |
| 963 | 964 | ret = process_options(filter, &options, copy); |
| 965 | +#else |
| 966 | + if (deprecated) { |
| 967 | + av_log(filter, AV_LOG_ERROR, "This syntax is deprecated. Use " |
| 968 | + "'|' to separate the list items ('%s' instead of '%s')\n", |
| 969 | + copy, args); |
| 970 | + ret = AVERROR(EINVAL); |
| 971 | + } else { |
| 972 | + ret = process_options(filter, &options, copy); |
| 973 | + } |
| 974 | +#endif |
| 964 | 975 | av_freep(©); |
| 965 | 976 | |
| 966 | 977 | if (ret < 0) |