virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfilter/formats: remove support for deprecated channel count specification

Browse Source 
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2018-01-06 22:04:21 +01:00
parent 7652af9df0
commit e3acba0d5d
2 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavfilter/formats.c
View File

@ -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, int ff_parse_channel_layout(int64_t *ret, int *nret, const char *arg,
void *log_ctx) void *log_ctx)
{ {
char *tail;
int64_t chlayout; int64_t chlayout;
int nb_channels; int nb_channels;
if (av_get_extended_channel_layout(arg, &chlayout, &nb_channels) < 0) { 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) { if (!chlayout && !nret) {
av_log(log_ctx, AV_LOG_ERROR, "Unknown channel layout '%s' is not supported.\n", arg); av_log(log_ctx, AV_LOG_ERROR, "Unknown channel layout '%s' is not supported.\n", arg);

2
tests/ref/fate/filter-formats
View File

@ -75,7 +75,7 @@ quad(side)
0 = ff_parse_channel_layout(0000000000000004, 1, 1c); 0 = ff_parse_channel_layout(0000000000000004, 1, 1c);
0 = ff_parse_channel_layout(0000000000000003, 2, 2c); 0 = ff_parse_channel_layout(0000000000000003, 2, 2c);
-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, -1c); -1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, -1c);
0 = ff_parse_channel_layout(0000000000000000, 60, 60c); -1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 60c);
-1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 65c); -1 = ff_parse_channel_layout(FFFFFFFFFFFFFFFF, -1, 65c);
0 = ff_parse_channel_layout(0000000000000000, 2, 2C); 0 = ff_parse_channel_layout(0000000000000000, 2, 2C);
0 = ff_parse_channel_layout(0000000000000000, 60, 60C); 0 = ff_parse_channel_layout(0000000000000000, 60, 60C);