generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

lavfi: parsing helper for unknown channel layouts.

Browse Source 
Make ff_parse_channel_layout() accept unknown layouts too.
(cherry picked from commit 6e2473edfd)
This commit is contained in:
Nicolas George
2013-10-25 15:07:40 +02:00
committed by Carl Eugen Hoyos
parent 1a676881ca
commit 838a453e39
6 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libavfilter/formats.c
View File

@@ -615,10 +615,21 @@ int ff_parse_sample_rate(int *ret, const char *arg, void *log_ctx)
return 0;
}
int ff_parse_channel_layout(int64_t *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 = av_get_channel_layout(arg);
int64_t chlayout, count;
if (nret) {
count = strtol(arg, &tail, 10);
if (*tail == 'c' && !tail[1] && count > 0 && count < 63) {
*nret = count;
*ret = 0;
return 0;
}
}
chlayout = av_get_channel_layout(arg);
if (chlayout == 0) {
chlayout = strtol(arg, &tail, 10);
if (*tail || chlayout == 0) {
@@ -627,6 +638,8 @@ int ff_parse_channel_layout(int64_t *ret, const char *arg, void *log_ctx)
}
}
*ret = chlayout;
if (nret)
*nret = av_get_channel_layout_nb_channels(chlayout);
return 0;
}