avfilter/formats: remove support for deprecated channel count specification

Marton Balint committed 8 years ago

Commit e3acba01 parent 7652af92 files · +3 −11Browse files

Unified · Split

2 files

 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]*/
+        av_log(log_ctx, AV_LOG_ERROR, "Invalid channel layout '%s'\n", arg);
-        nb_channels = strtol(arg, &tail, 10);
+        return AVERROR(EINVAL);
-        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);
-        }
     }
     if (!chlayout && !nret) {
         av_log(log_ctx, AV_LOG_ERROR, "Unknown channel layout '%s' is not supported.\n", arg);

@@ -75,7 +75,7 @@ quad(side) · 74 unmodified lines
75	0 = ff_parse_channel_layout(0000000000000004, 1, 1c);	75	0 = ff_parse_channel_layout(0000000000000004, 1, 1c);
76	0 = ff_parse_channel_layout(0000000000000003, 2, 2c);	76	0 = ff_parse_channel_layout(0000000000000003, 2, 2c);
77	-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, -1c);	77	-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, -1c);
78	0 = ff_parse_channel_layout(0000000000000000, 60, 60c);	78	-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 60c);
79	-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 65c);	79	-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 65c);
80	0 = ff_parse_channel_layout(0000000000000000, 2, 2C);	80	0 = ff_parse_channel_layout(0000000000000000, 2, 2C);
81	0 = ff_parse_channel_layout(0000000000000000, 60, 60C);	81	0 = ff_parse_channel_layout(0000000000000000, 60, 60C);

Keyboard shortcuts