[FFmpeg-cvslog] doc/filters: move "aformat" before "amerge".

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <ubitux at gmail.com> | Thu May 24 23:55:17 2012 +0200| [ba4aa656ce1c4e530bec4ed1b0fcf67eb20283f0] | committer: Clément Bœsch

doc/filters: move "aformat" before "amerge".

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=ba4aa656ce1c4e530bec4ed1b0fcf67eb20283f0
---

 doc/filters.texi |   52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/doc/filters.texi b/doc/filters.texi
index 3a31a01..28d758c 100644
--- a/doc/filters.texi
+++ b/doc/filters.texi
@@ -140,6 +140,32 @@ aconvert=u8:auto
 @end example
 @end itemize
 
+ at 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:
+ at table @option
+
+ at item sample_fmts
+A comma-separated list of requested sample formats.
+
+ at item sample_rates
+A comma-separated list of requested sample rates.
+
+ at item channel_layouts
+A comma-separated list of requested channel layouts.
+
+ at 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:
+ at example
+aformat=sample_fmts\=u8\,s16:channel_layouts\=stereo
+ at 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
 
- at 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:
- at table @option
-
- at item sample_fmts
-A comma-separated list of requested sample formats.
-
- at item sample_rates
-A comma-separated list of requested sample rates.
-
- at item channel_layouts
-A comma-separated list of requested channel layouts.
-
- at 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:
- at example
-aformat=sample_fmts\=u8\,s16:channel_layouts\=stereo
- at end example
-
 @section anull
 
 Pass the audio source unchanged to the output.