[FFmpeg-cvslog] doc/muxers: Add AIFF doc

Timothy Gu git at videolan.org
Thu Aug 29 00:22:05 CEST 2013


ffmpeg | branch: release/1.0 | Timothy Gu <timothygu99 at gmail.com> | Tue Jul  2 19:32:27 2013 -0700| [2f1370da22841cea3846e86f8cb87d669a396833] | committer: Timothy Gu

doc/muxers: Add AIFF doc

Signed-off-by: Stefano Sabatini <stefasab at gmail.com>
(cherry picked from commit 4ec46b1160eb549a551823c168905b43922add31)

Signed-off-by: Timothy Gu <timothygu99 at gmail.com>

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

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

diff --git a/doc/muxers.texi b/doc/muxers.texi
index 1685b12..8fd7ecd 100644
--- a/doc/muxers.texi
+++ b/doc/muxers.texi
@@ -18,6 +18,23 @@ enabled muxers.
 
 A description of some of the currently available muxers follows.
 
+ at anchor{aiff}
+ at section aiff
+
+Audio Interchange File Format muxer.
+
+It accepts the following options:
+
+ at table @option
+ at item write_id3v2
+Enable ID3v2 tags writing when set to 1. Default is 0 (disabled).
+
+ at item id3v2_version
+Select ID3v2 version to write. Currently only version 3 and 4 (aka.
+ID3v2.3 and ID3v2.4) are supported. The default is version 4.
+
+ at end table
+
 @anchor{crc}
 @section crc
 



More information about the ffmpeg-cvslog mailing list