diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 22:31:41 +0200 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-23 22:31:44 +0200 |
commit | 187297b871a3dca9c90dac5aa6cd65f9c8edb240 (patch) | |
tree | dab5cd2344e29a65a62058cc287e8f1020f3466b /doc/formats.texi | |
parent | 211ad5042adcf9f6e8abb9d0f1f3316331481535 (diff) | |
parent | 6911d9e1b0cffee4cdf5f12be2030b7edbc65a32 (diff) | |
download | ffmpeg-187297b871a3dca9c90dac5aa6cd65f9c8edb240.tar.gz |
Merge remote-tracking branch 'TimothyGu/release/2.0' into release/2.0
* TimothyGu/release/2.0:
doc/encoders: add doc for AAC encoder
doc/formats: Add documentation for 3 parameters that have been missing
doc/encoders: improve libvo-aacenc doc
doc/encoders: reformat and add some clarification in libtwolame doc
doc/encoders: reformat libmp3lame doc
doc/encoders: add libxvid doc
doc/encoders: partially rewrite and reformat libx264 docs
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/formats.texi')
-rw-r--r-- | doc/formats.texi | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/formats.texi b/doc/formats.texi index 6e69bfa582..d99dca818f 100644 --- a/doc/formats.texi +++ b/doc/formats.texi @@ -57,6 +57,9 @@ Enable RTP MP4A-LATM payload. Reduce the latency introduced by optional buffering @end table +@item seek2any @var{integer} (@emph{input}) +Forces seeking to enable seek to any mode if set to 1. Default is 0. + @item analyzeduration @var{integer} (@emph{input}) Specify how many microseconds are analyzed to probe the input. A higher value will allow to detect more accurate information, but will @@ -133,6 +136,12 @@ been without shifting. Also note that this affects only leading negative timestamps, and not non-monotonic negative timestamps. +@item skip_initial_bytes @var{integer} (@emph{input}) +Set number initial bytes to skip. Default is 0. + +@item correct_ts_overflow @var{integer} (@emph{input}) +Correct single timestamp overflows if set to 1. Default is 1. + @item flush_packets @var{integer} (@emph{output}) Flush the underlying I/O stream after each packet. Default 1 enables it, and has the effect of reducing the latency; 0 disables it and may slightly |