diff options
| author | Marton Balint <cus@passwd.hu> | 2018-01-06 22:04:21 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2018-01-20 18:07:44 +0100 |
| commit | e3acba0d5d7b5b35b779b25ec3a76a4d80a405ea (patch) | |
| tree | 6d6feea9c3e485d0b01d658d69c5c18a3ebe50b1 /libavfilter/formats.c | |
| parent | 7652af9df06ddcdb6f6fdf52919c2d6260b51ca1 (diff) | |
| download | ffmpeg-e3acba0d5d7b5b35b779b25ec3a76a4d80a405ea.tar.gz | |
avfilter/formats: remove support for deprecated channel count specification
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavfilter/formats.c')
| -rw-r--r-- | libavfilter/formats.c | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/libavfilter/formats.c b/libavfilter/formats.c index 20a2c89719..31ee445c49 100644 --- a/libavfilter/formats.c +++ b/libavfilter/formats.c @@ -662,20 +662,12 @@ int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx) int ff_parse_channel_layout(int64_t *ret, int *nret, const char *arg, void *log_ctx) { - char *tail; int64_t chlayout; int nb_channels; if (av_get_extended_channel_layout(arg, &chlayout, &nb_channels) < 0) { - /* [TEMPORARY 2016-12 -> 2017-12]*/ - nb_channels = strtol(arg, &tail, 10); - if (!errno && *tail == 'c' && *(tail + 1) == '\0' && nb_channels > 0 && nb_channels < 64) { - chlayout = 0; - av_log(log_ctx, AV_LOG_WARNING, "Deprecated channel count specification '%s'. This will stop working in releases made in 2018 and after.\n", arg); - } else { - av_log(log_ctx, AV_LOG_ERROR, "Invalid channel layout '%s'\n", arg); - return AVERROR(EINVAL); - } + av_log(log_ctx, AV_LOG_ERROR, "Invalid channel layout '%s'\n", arg); + return AVERROR(EINVAL); } if (!chlayout && !nret) { av_log(log_ctx, AV_LOG_ERROR, "Unknown channel layout '%s' is not supported.\n", arg); |