aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2016-12-26 01:19:34 +0100
committerMarton Balint <cus@passwd.hu>2017-01-24 23:51:36 +0100
commitc4618f842a2de85097627763f02931afc3fde6d9 (patch)
tree3ce0700ff1dfa7f52726aa984558c04cc3e5209f /doc
parent5049f05f27c20f0606209bf3508e1157e0eabc9e (diff)
downloadffmpeg-c4618f842a2de85097627763f02931afc3fde6d9.tar.gz
avutil/channel_layout: add av_get_extended_channel_layout
Return a channel layout and the number of channels based on the specified name. This function is similar to av_get_channel_layout(), but can also parse unknown channel layout specifications. Unknown channel layout specifications are a decimal number and a capital 'C' suffix, in order to not break compatibility with the lowercase 'c' suffix, which is used for a guessed channel layout with the specified number of channels. Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'doc')
-rw-r--r--doc/APIchanges3
-rw-r--r--doc/utils.texi7
2 files changed, 9 insertions, 1 deletions
diff --git a/doc/APIchanges b/doc/APIchanges
index f5f7e0c07f..109d550573 100644
--- a/doc/APIchanges
+++ b/doc/APIchanges
@@ -15,6 +15,9 @@ libavutil: 2015-08-28
API changes, most recent first:
+2017-01-24 - xxxxxxx - lavu 55.45.100 - channel_layout.h
+ Add av_get_extended_channel_layout()
+
2017-01-22 - xxxxxxx - lavu 55.44.100 - lfg.h
Add av_lfg_init_from_data().
diff --git a/doc/utils.texi b/doc/utils.texi
index df887c7768..30a962ac0e 100644
--- a/doc/utils.texi
+++ b/doc/utils.texi
@@ -725,13 +725,18 @@ layout for that number of channels (see the function
default layout.
@item
+a number of channels, in decimal, followed by 'C', yielding an unknown channel
+layout with the specified number of channels. Note that not all channel layout
+specification strings support unknown channel layouts.
+
+@item
a channel layout mask, in hexadecimal starting with "0x" (see the
@code{AV_CH_*} macros in @file{libavutil/channel_layout.h}.
@end itemize
Before libavutil version 53 the trailing character "c" to specify a number of
channels was optional, but now it is required, while a channel layout mask can
-also be specified as a decimal number (if and only if not followed by "c").
+also be specified as a decimal number (if and only if not followed by "c" or "C").
See also the function @code{av_get_channel_layout} defined in
@file{libavutil/channel_layout.h}.