From 987763ac35d3db8beb77e7c5e8426e1b265b2f95 Mon Sep 17 00:00:00 2001 From: James Almer Date: Thu, 2 Sep 2021 21:04:30 -0300 Subject: ffmpeg: convert to new channel layout-API Signed-off-by: James Almer --- doc/utils.texi | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'doc') diff --git a/doc/utils.texi b/doc/utils.texi index 44ce285d26..1818f107d6 100644 --- a/doc/utils.texi +++ b/doc/utils.texi @@ -721,20 +721,28 @@ FL+FR+FC+BL+BR+BC+SL+SR+WL+WR+TBL+TBR+TBC+TFC+TFL+TFR DL+DR @end table -A custom channel layout can be specified as a sequence of terms, separated by -'+' or '|'. Each term can be: +A custom channel layout can be specified as a sequence of terms, separated by '+'. +Each term can be: @itemize @item -the name of a standard channel layout (e.g. @samp{mono}, -@samp{stereo}, @samp{4.0}, @samp{quad}, @samp{5.0}, etc.) +the name of a single channel (e.g. @samp{FL}, @samp{FR}, @samp{FC}, @samp{LFE}, etc.), +each optionally containing a custom name after a '@@', (e.g. @samp{FL@@Left}, +@samp{FR@@Right}, @samp{FC@@Center}, @samp{LFE@@Low_Frequency}, etc.) +@end itemize +A standard channel layout can be specified by the following: +@itemize @item the name of a single channel (e.g. @samp{FL}, @samp{FR}, @samp{FC}, @samp{LFE}, etc.) +@item +the name of a standard channel layout (e.g. @samp{mono}, +@samp{stereo}, @samp{4.0}, @samp{quad}, @samp{5.0}, etc.) + @item a number of channels, in decimal, followed by 'c', yielding the default channel layout for that number of channels (see the function -@code{av_get_default_channel_layout}). Note that not all channel counts have a +@code{av_channel_layout_default}). Note that not all channel counts have a default layout. @item @@ -751,7 +759,7 @@ 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" or "C"). -See also the function @code{av_get_channel_layout} defined in +See also the function @code{av_channel_layout_from_string} defined in @file{libavutil/channel_layout.h}. @c man end SYNTAX -- cgit v1.2.3