From ba4aa656ce1c4e530bec4ed1b0fcf67eb20283f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Thu, 24 May 2012 23:55:17 +0200 Subject: [PATCH] doc/filters: move "aformat" before "amerge". --- doc/filters.texi | 52 ++++++++++++++++++++++++------------------------ 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/doc/filters.texi b/doc/filters.texi index 3a31a01b5e..28d758c923 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -140,6 +140,32 @@ aconvert=u8:auto @end example @end itemize +@section aformat + +Convert the input audio to one of the specified formats. The framework will +negotiate the most appropriate format to minimize conversions. + +The filter accepts the following named parameters: +@table @option + +@item sample_fmts +A comma-separated list of requested sample formats. + +@item sample_rates +A comma-separated list of requested sample rates. + +@item channel_layouts +A comma-separated list of requested channel layouts. + +@end table + +If a parameter is omitted, all values are allowed. + +For example to force the output to either unsigned 8-bit or signed 16-bit stereo: +@example +aformat=sample_fmts\=u8\,s16:channel_layouts\=stereo +@end example + @section amerge Merge two audio streams into a single multi-channel stream. @@ -190,32 +216,6 @@ amovie=input.mkv:si=5 [a5]; [x3][a5] amerge" -c:a pcm_s16le output.mkv @end example -@section aformat - -Convert the input audio to one of the specified formats. The framework will -negotiate the most appropriate format to minimize conversions. - -The filter accepts the following named parameters: -@table @option - -@item sample_fmts -A comma-separated list of requested sample formats. - -@item sample_rates -A comma-separated list of requested sample rates. - -@item channel_layouts -A comma-separated list of requested channel layouts. - -@end table - -If a parameter is omitted, all values are allowed. - -For example to force the output to either unsigned 8-bit or signed 16-bit stereo: -@example -aformat=sample_fmts\=u8\,s16:channel_layouts\=stereo -@end example - @section anull Pass the audio source unchanged to the output.