[FFmpeg-cvslog] doc/demuxers: restore alphabetical order

Stefano Sabatini git at videolan.org
Thu Oct 13 20:40:33 EEST 2016


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Thu Oct 13 17:47:49 2016 +0200| [23f0f1537ea08ed8ace0f421baef282a1c0e5f5f] | committer: Stefano Sabatini

doc/demuxers: restore alphabetical order

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

 doc/demuxers.texi | 80 +++++++++++++++++++++++++++----------------------------
 1 file changed, 40 insertions(+), 40 deletions(-)

diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 87f78f3..2934a1c 100644
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -254,46 +254,6 @@ This demuxer is used to demux FLV files and RTMP network streams.
 Allocate the streams according to the onMetaData array content.
 @end table
 
- at section libgme
-
-The Game Music Emu library is a collection of video game music file emulators.
-
-See @url{http://code.google.com/p/game-music-emu/} for more information.
-
-Some files have multiple tracks. The demuxer will pick the first track by
-default. The @option{track_index} option can be used to select a different
-track. Track indexes start at 0. The demuxer exports the number of tracks as
- at var{tracks} meta data entry.
-
-For very large files, the @option{max_size} option may have to be adjusted.
-
- at section libopenmpt
-
-libopenmpt based module demuxer
-
-See @url{https://lib.openmpt.org/libopenmpt/} for more information.
-
-Some files have multiple subsongs (tracks) this can be set with the @option{subsong}
-option.
-
-It accepts the following options:
-
- at table @option
- at item subsong
-Set the subsong index. This can be either  'all', 'auto', or the index of the
-subsong. Subsong indexes start at 0. The default is 'auto'.
-
-The default value is to let libopenmpt choose.
-
- at item layout
-Set the channel layout. Valid values are 1, 2, and 4 channel layouts.
-The default value is STEREO.
-
- at item sample_rate
-Set the sample rate for libopenmpt to output.
-Range is from 1000 to INT_MAX. The value default is 48000.
- at end table
-
 @section gif
 
 Animated GIF demuxer.
@@ -468,6 +428,46 @@ ffmpeg -framerate 10 -pattern_type glob -i "*.png" out.mkv
 @end example
 @end itemize
 
+ at section libgme
+
+The Game Music Emu library is a collection of video game music file emulators.
+
+See @url{http://code.google.com/p/game-music-emu/} for more information.
+
+Some files have multiple tracks. The demuxer will pick the first track by
+default. The @option{track_index} option can be used to select a different
+track. Track indexes start at 0. The demuxer exports the number of tracks as
+ at var{tracks} meta data entry.
+
+For very large files, the @option{max_size} option may have to be adjusted.
+
+ at section libopenmpt
+
+libopenmpt based module demuxer
+
+See @url{https://lib.openmpt.org/libopenmpt/} for more information.
+
+Some files have multiple subsongs (tracks) this can be set with the @option{subsong}
+option.
+
+It accepts the following options:
+
+ at table @option
+ at item subsong
+Set the subsong index. This can be either  'all', 'auto', or the index of the
+subsong. Subsong indexes start at 0. The default is 'auto'.
+
+The default value is to let libopenmpt choose.
+
+ at item layout
+Set the channel layout. Valid values are 1, 2, and 4 channel layouts.
+The default value is STEREO.
+
+ at item sample_rate
+Set the sample rate for libopenmpt to output.
+Range is from 1000 to INT_MAX. The value default is 48000.
+ at end table
+
 @section mov/mp4/3gp/QuickTime
 
 QuickTime / MP4 demuxer.



More information about the ffmpeg-cvslog mailing list