Merge remote-tracking branch 'qatar/master'

[ffmpeg] / doc / demuxers.texi

diff --git a/doc/demuxers.texi b/doc/demuxers.texi
index 76d13b1d46963e155586cd99fccfb255c6239117..a7af1c8d084c9aa8cbd858cf7a95e8921f348662 100644 (file)
--- a/doc/demuxers.texi
+++ b/doc/demuxers.texi
@@ -49,19 +49,19 @@ sequence of filenames of the form @file{i%m%g-1.jpg},
 The size, the pixel format, and the format of each image must be the
 same for all the files in the sequence.
 
 The size, the pixel format, and the format of each image must be the
 same for all the files in the sequence.
 

-The following example shows how to use @file{ffmpeg} for creating a
+The following example shows how to use @command{ffmpeg} for creating a

 video from the images in the file sequence @file{img-001.jpeg},
 @file{img-002.jpeg}, ..., assuming an input frame rate of 10 frames per
 second:
 @example
 video from the images in the file sequence @file{img-001.jpeg},
 @file{img-002.jpeg}, ..., assuming an input frame rate of 10 frames per
 second:
 @example

-ffmpeg -r 10 -f image2 -i 'img-%03d.jpeg' out.avi
+ffmpeg -i 'img-%03d.jpeg' -r 10 out.mkv

 @end example
 
 Note that the pattern must not necessarily contain "%d" or
 "%0@var{N}d", for example to convert a single image file
 @file{img.jpeg} you can employ the command:
 @example
 @end example
 
 Note that the pattern must not necessarily contain "%d" or
 "%0@var{N}d", for example to convert a single image file
 @file{img.jpeg} you can employ the command:
 @example

-ffmpeg -f image2 -i img.jpeg img.png
+ffmpeg -i img.jpeg img.png

 @end example
 
 @section applehttp
 @end example
 
 @section applehttp


@@ -75,4 +75,34 @@ the caller can decide which variant streams to actually receive.
 The total bitrate of the variant that the stream belongs to is
 available in a metadata key named "variant_bitrate".
 
 The total bitrate of the variant that the stream belongs to is
 available in a metadata key named "variant_bitrate".
 

+@section sbg
+
+SBaGen script demuxer.
+
+This demuxer reads the script language used by SBaGen
+@url{http://uazu.net/sbagen/} to generate binaural beats sessions. A SBG
+script looks like that:
+@example
+-SE
+a: 300-2.5/3 440+4.5/0
+b: 300-2.5/0 440+4.5/3
+off: -
+NOW      == a
++0:07:00 == b
++0:14:00 == a
++0:21:00 == b
++0:30:00    off
+@end example
+
+A SBG script can mix absolute and relative timestamps. If the script uses
+either only absolute timestamps (including the script start time) or only
+relative ones, then its layout is fixed, and the conversion is
+straightforward. On the other hand, if the script mixes both kind of
+timestamps, then the @var{NOW} reference for relative timestamps will be
+taken from the current time of day at the time the script is read, and the
+script layout will be frozen according to that reference. That means that if
+the script is directly played, the actual times will match the absolute
+timestamps up to the sound controller's clock accuracy, but if the user
+somehow pauses the playback or seeks, all times will be shifted accordingly.
+

 @c man end INPUT DEVICES
 @c man end INPUT DEVICES