diff options
author | James Almer <jamrial@gmail.com> | 2017-10-21 15:27:03 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-10-21 15:27:03 -0300 |
commit | 0ed61546c4594480b7c09a0c79da24d78968fbf0 (patch) | |
tree | 60791ccb8343a46db69efe6e89d53c66dfadd06b /libavfilter/af_join.c | |
parent | ea049ad862a4b2b398bbdade5af36291d786e02d (diff) | |
parent | 88fd836a015a5f3380df74592e440e7d1e5b8000 (diff) | |
download | ffmpeg-0ed61546c4594480b7c09a0c79da24d78968fbf0.tar.gz |
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/af_join.c')
-rw-r--r-- | libavfilter/af_join.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/libavfilter/af_join.c b/libavfilter/af_join.c index f8af0a1804..33df685691 100644 --- a/libavfilter/af_join.c +++ b/libavfilter/af_join.c @@ -112,14 +112,6 @@ static int parse_maps(AVFilterContext *ctx) char separator = '|'; char *cur = s->map; -#if FF_API_OLD_FILTER_OPTS - if (cur && strchr(cur, ',')) { - av_log(ctx, AV_LOG_WARNING, "This syntax is deprecated, use '|' to " - "separate the mappings.\n"); - separator = ','; - } -#endif - while (cur && *cur) { char *sep, *next, *p; uint64_t in_channel = 0, out_channel = 0; |