diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 12:30:14 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-09 12:30:14 +0100 |
commit | 4765f635387cef3efb01e52e59d4f3add126a0e2 (patch) | |
tree | a41b58a7f4262729b93f5e7a7538fc41770b9f93 /doc | |
parent | 75afbe2ab4a14cdfdc4001869ae67ded99cf5ce7 (diff) | |
parent | d744801f1a7c65200a6ed207bb0dea197432288e (diff) | |
download | ffmpeg-4765f635387cef3efb01e52e59d4f3add126a0e2.tar.gz |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
xan: Convert to bytestream2
oggenc: add a page_duration option and deprecate the pagesize option
x86: lavr: add SSE2/AVX dither_int_to_float()
Conflicts:
libavcodec/xan.c
libavformat/oggenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
-rw-r--r-- | doc/muxers.texi | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/doc/muxers.texi b/doc/muxers.texi index fb642847e1..2f62d6351d 100644 --- a/doc/muxers.texi +++ b/doc/muxers.texi @@ -717,4 +717,19 @@ ffmpeg -i input.mp3 -i cover.png -c copy -metadata:s:v title="Album cover" -metadata:s:v comment="Cover (Front)" out.mp3 @end example +@section ogg + +Ogg container muxer. + +@table @option +@item -page_duration @var{duration} +Preferred page duration, in microseconds. The muxer will attempt to create +pages that are approximately @var{duration} microseconds long. This allows the +user to compromise between seek granularity and container overhead. The default +is 1 second. A value of 0 will fill all segments, making pages as large as +possible. A value of 1 will effectively use 1 packet-per-page in most +situations, giving a small seek granularity at the cost of additional container +overhead. +@end table + @c man end MUXERS |