[FFmpeg-devel] [PATCH 1/4] lavf/astenc: fix weird indent, use braces in else statements

[FFmpeg-devel] [PATCH 1/4] lavf/astenc: fix weird indent, use braces in else statements

[Stefano Sabatini]

Braces are employed to improve readability.
---
 libavformat/astenc.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/libavformat/astenc.c b/libavformat/astenc.c
index 259948b276..250a54b573 100644
--- a/libavformat/astenc.c
+++ b/libavformat/astenc.c
@@ -143,14 +143,16 @@ static int ast_write_trailer(AVFormatContext *s)
 
         /* Loopstart if provided */
         if (ast->loopstart > 0) {
-        if (ast->loopstart >= samples) {
-            av_log(s, AV_LOG_WARNING, "Loopstart value is out of range and will be ignored\n");
-            ast->loopstart = -1;
-            avio_skip(pb, 4);
-        } else
-        avio_wb32(pb, ast->loopstart);
-        } else
+            if (ast->loopstart >= samples) {
+                av_log(s, AV_LOG_WARNING, "Loopstart value is out of range and will be ignored\n");
+                ast->loopstart = -1;
+                avio_skip(pb, 4);
+            } else {
+                avio_wb32(pb, ast->loopstart);
+            }
+        } else {
             avio_skip(pb, 4);
+        }
 
         /* Loopend if provided. Otherwise number of samples again */
         if (ast->loopend && ast->loopstart >= 0) {
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/4] doc/muxers: add ast

[Stefano Sabatini]

---
 doc/muxers.texi | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/doc/muxers.texi b/doc/muxers.texi
index c8b2bcdea6..fee8321eab 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -763,6 +763,30 @@ default is @code{false}, otherwise they are cached until the expected
 time event is found.
 @end table
 
+@section ast
+AST (Audio Stream) muxer.
+
+This format is used to play audio on some Nintendo Wii games.
+
+It accepts a single audio stream.
+
+The @option{loopstart} and @option{loopend} options can be used to
+define a section of the file to loop for players honoring such
+options.
+
+@subsection Options
+@table @option
+@item loopstart @var{start}
+Specify loop start position expressesd in milliseconds, from @code{-1}
+to @code{INT_MAX}, in case @code{-1} is set then no loop is specified
+(default -1) and the @option{loopend} value is ignored.
+
+@item loopend @var{end}
+Specify loop end position expressed in milliseconds, from @code{0} to
+@code{INT_MAX}, default is @code{0}, in case @code{0} is set it
+assumes the total stream duration.
+@end table
+
 @anchor{avi}
 @section avi
 
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/4] doc/muxers: add au

[Stefano Sabatini]

---
 doc/muxers.texi | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/doc/muxers.texi b/doc/muxers.texi
index fee8321eab..7ed5ed50a5 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -787,6 +787,11 @@ Specify loop end position expressed in milliseconds, from @code{0} to
 assumes the total stream duration.
 @end table
 
+@section au
+SUN AU audio muxer.
+
+It accepts a single audio stream.
+
 @anchor{avi}
 @section avi
 
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 4/4] doc/muxers/avi: apply misc changes

[Stefano Sabatini]

In particular:
* sort options by name
* apply misc formatting and consistency fixes
* add introduction explaining the need to set some options
---
 doc/muxers.texi | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 7ed5ed50a5..1c88816c3c 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -794,15 +794,24 @@ It accepts a single audio stream.
 
 @anchor{avi}
 @section avi
-
 Audio Video Interleaved muxer.
 
-@subsection Options
+AVI is a proprietary format developed by Microsoft, and later formally specified
+through the Open DML specification.
 
-It accepts the following options:
+Because of differences in players implementations, it might be required to set
+some options to make sure that the generated output can be correctly played by
+the target player.
 
+@subsection Options
 @table @option
-@item reserve_index_space
+@item flipped_raw_rgb @var{bool}
+If set to @code{true}, store positive height for raw RGB bitmaps, which
+indicates bitmap is stored bottom-up. Note that this option does not flip the
+bitmap which has to be done manually beforehand, e.g. by using the @samp{vflip}
+filter. Default is @code{false} and indicates bitmap is stored top down.
+
+@item reserve_index_space @var{size}
 Reserve the specified amount of bytes for the OpenDML master index of each
 stream within the file header. By default additional master indexes are
 embedded within the data packets if there is no space left in the first master
@@ -815,20 +824,15 @@ The required index space depends on the output file size and should be about 16
 bytes per gigabyte. When this option is omitted or set to zero the necessary
 index space is guessed.
 
-@item write_channel_mask
+Default value is @code{0}.
+
+@item write_channel_mask @var{bool}
 Write the channel layout mask into the audio stream header.
 
 This option is enabled by default. Disabling the channel mask can be useful in
 specific scenarios, e.g. when merging multiple audio streams into one for
 compatibility with software that only supports a single audio stream in AVI
 (see @ref{amerge,,the "amerge" section in the ffmpeg-filters manual,ffmpeg-filters}).
-
-@item flipped_raw_rgb
-If set to true, store positive height for raw RGB bitmaps, which indicates
-bitmap is stored bottom-up. Note that this option does not flip the bitmap
-which has to be done manually beforehand, e.g. by using the vflip filter.
-Default is @var{false} and indicates bitmap is stored top down.
-
 @end table
 
 @anchor{chromaprint}
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 1/4] lavf/astenc: fix weird indent, use braces in else statements

[Stefano Sabatini]

Braces are employed to improve readability.
---
 libavformat/astenc.c | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/libavformat/astenc.c b/libavformat/astenc.c
index 259948b276..250a54b573 100644
--- a/libavformat/astenc.c
+++ b/libavformat/astenc.c
@@ -143,14 +143,16 @@ static int ast_write_trailer(AVFormatContext *s)
 
         /* Loopstart if provided */
         if (ast->loopstart > 0) {
-        if (ast->loopstart >= samples) {
-            av_log(s, AV_LOG_WARNING, "Loopstart value is out of range and will be ignored\n");
-            ast->loopstart = -1;
-            avio_skip(pb, 4);
-        } else
-        avio_wb32(pb, ast->loopstart);
-        } else
+            if (ast->loopstart >= samples) {
+                av_log(s, AV_LOG_WARNING, "Loopstart value is out of range and will be ignored\n");
+                ast->loopstart = -1;
+                avio_skip(pb, 4);
+            } else {
+                avio_wb32(pb, ast->loopstart);
+            }
+        } else {
             avio_skip(pb, 4);
+        }
 
         /* Loopend if provided. Otherwise number of samples again */
         if (ast->loopend && ast->loopstart >= 0) {
-- 
2.34.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".