diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 14:48:12 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-24 15:30:12 +0200 |
| commit | e744e9a305896d8cbe3c06951b0a7e535ccd8562 (patch) | |
| tree | c9bc041c4b247e923f14baa243d8d050e442f101 /doc | |
| parent | 6ef5e292200b6824b666a6a876d344fe7e6a48b2 (diff) | |
| parent | ef363ebd596da18f889a7d4845023a23dfac84c9 (diff) | |
Merge commit 'ef363ebd596da18f889a7d4845023a23dfac84c9'
* commit 'ef363ebd596da18f889a7d4845023a23dfac84c9':
mp3enc: write full LAME frame
Conflicts:
libavformat/mp3enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/muxers.texi | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index 12e980cfd6..cacc46ccf7 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -615,7 +615,8 @@ to provide the pictures as soon as possible to avoid excessive buffering. A Xing/LAME frame right after the ID3v2 header (if present). It is enabled by default, but will be written only if the output is seekable. The @code{write_xing} private option can be used to disable it. The frame contains -various information that may be useful to the decoder, like the audio duration. +various information that may be useful to the decoder, like the audio duration +or encoder delay. @item A legacy ID3v1 tag at the end of the file (disabled by default). It may be |