diff options
author | Nicolas George <george@nsup.org> | 2013-10-25 15:07:40 +0200 |
---|---|---|
committer | Nicolas George <george@nsup.org> | 2013-11-03 10:30:25 +0100 |
commit | 6e2473edfda26a556c615ebc04d8aeba800bef7e (patch) | |
tree | fab01a80a859aeee3e50aba1a963d6b2be6d4d2d /libavfilter/internal.h | |
parent | d300f5f6f570659e4b58567b35c9e8600c9f2956 (diff) | |
download | ffmpeg-6e2473edfda26a556c615ebc04d8aeba800bef7e.tar.gz |
lavfi: parsing helper for unknown channel layouts.
Make ff_parse_channel_layout() accept unknown layouts too.
Diffstat (limited to 'libavfilter/internal.h')
-rw-r--r-- | libavfilter/internal.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavfilter/internal.h b/libavfilter/internal.h index f8d0cce638..5e19698d07 100644 --- a/libavfilter/internal.h +++ b/libavfilter/internal.h @@ -207,11 +207,14 @@ int ff_parse_sample_format(int *ret, const char *arg, void *log_ctx); * Parse a channel layout or a corresponding integer representation. * * @param ret 64bit integer pointer to where the value should be written. + * @param nret integer pointer to the number of channels; + * if not NULL, then unknown channel layouts are accepted * @param arg string to parse * @param log_ctx log context * @return >= 0 in case of success, a negative AVERROR code on error */ -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); void ff_update_link_current_pts(AVFilterLink *link, int64_t pts); |