Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
e3acba0d
Commit
e3acba0d
authored
Jan 06, 2018
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/formats: remove support for deprecated channel count specification
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
7652af9d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
11 deletions
+3
-11
formats.c
libavfilter/formats.c
+2
-10
filter-formats
tests/ref/fate/filter-formats
+1
-1
No files found.
libavfilter/formats.c
View file @
e3acba0d
...
...
@@ -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
);
...
...
tests/ref/fate/filter-formats
View file @
e3acba0d
...
...
@@ -75,7 +75,7 @@ quad(side)
0 = ff_parse_channel_layout(0000000000000004, 1, 1c);
0 = ff_parse_channel_layout(0000000000000003, 2, 2c);
-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);
0 = ff_parse_channel_layout(0000000000000000, 2, 2C);
0 = ff_parse_channel_layout(0000000000000000, 60, 60C);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment