[FFmpeg-cvslog] doc/ffmpeg-formats: Add documentation for 2 parameters that have been missing

Timothy Gu git at videolan.org
Fri Oct 11 15:35:16 CEST 2013


ffmpeg | branch: release/1.1 | Timothy Gu <timothygu99 at gmail.com> | Sun Sep 15 19:08:58 2013 -0700| [c42fd4c6eee4019570a80b920229c2b022d9ec40] | committer: Timothy Gu

doc/ffmpeg-formats: Add documentation for 2 parameters that have been missing

(partially cherry picked from commit b7dd4598630fb1f890ae060f21a9ec92a103f22d)

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

Conflicts:
	doc/formats.texi

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

 doc/ffmpeg-formats.texi |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/doc/ffmpeg-formats.texi b/doc/ffmpeg-formats.texi
index 03e4f30..4d90386 100644
--- a/doc/ffmpeg-formats.texi
+++ b/doc/ffmpeg-formats.texi
@@ -140,6 +140,12 @@ Use wallclock as timestamps.
 @item avoid_negative_ts @var{integer} (@emph{output})
 Shift timestamps to make them positive. 1 enables, 0 disables, default
 of -1 enables when required by target format.
+
+ at item skip_initial_bytes @var{integer} (@emph{input})
+Set number initial bytes to skip. Default is 0.
+
+ at item correct_ts_overflow @var{integer} (@emph{input})
+Correct single timestamp overflows if set to 1. Default is 1.
 @end table
 
 @c man end FORMAT OPTIONS



More information about the ffmpeg-cvslog mailing list