diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 15:23:11 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-17 15:23:11 +0100 |
| commit | 5049b6a1fe52f549bad6721f162b4ec2d9d0a357 (patch) | |
| tree | d62ca24e8d518600e8c6fee9f5ac2471fcd9ba99 /doc | |
| parent | 045d80076a67aade020417f4adcb026b6a3da823 (diff) | |
| parent | f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd (diff) | |
Merge commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd'
* commit 'f9cc6883a4e5cf72cbfa21d17e1908a2a432f6bd':
mp3enc: add an option for disabling the Xing frame.
Conflicts:
doc/muxers.texi
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/muxers.texi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 989cb96f6d..0dc8a33628 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -544,9 +544,10 @@ optionally an ID3v1 tag at the end. ID3v2.3 and ID3v2.4 are supported, the @code{id3v2_version} option controls which one is used. The legacy ID3v1 tag is not written by default, but may be enabled with the @code{write_id3v1} option. -For seekable output the muxer also writes a Xing frame at the beginning, which -contains the number of frames in the file. It is useful for computing duration -of VBR files. +The muxer may also write a Xing frame at the beginning, which contains the +number of frames in the file. It is useful for computing duration of VBR files. +The Xing frame is written if the output stream is seekable and if the +@code{write_xing} option is set to 1 (the default). The muxer supports writing ID3v2 attached pictures (APIC frames). The pictures are supplied to the muxer in form of a video stream with a single packet. There |