aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2013-03-19 00:09:14 +0100
committerStefano Sabatini <stefasab@gmail.com>2013-03-19 17:31:16 +0100
commit18f43de96497ad7f4ca1ea3e8002eb55c522b86f (patch)
treee8e76090fadef7add44ab77b54ccc783b76497e1 /doc
parent2bac6b6f5ee846348262fe3c9b58334e6e063740 (diff)
downloadffmpeg-18f43de96497ad7f4ca1ea3e8002eb55c522b86f.tar.gz
doc/ffmpeg,ffmpeg-formats: avoid to mention ffmpeg options from formats.texi
Also extends documentation for timestamp related ffmpeg options, in order to make more apparent the fact that muxer processing may change the timestamps values.
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg-formats.texi5
-rw-r--r--doc/ffmpeg.texi12
2 files changed, 11 insertions, 6 deletions
diff --git a/doc/ffmpeg-formats.texi b/doc/ffmpeg-formats.texi
index 26596278cd..db9215c616 100644
--- a/doc/ffmpeg-formats.texi
+++ b/doc/ffmpeg-formats.texi
@@ -151,11 +151,6 @@ been without shifting.
Also note that this affects only leading negative timestamps, and not
non-monotonic negative timestamps.
-
-When avoid_negative_ts is used together with copyts, vsync or async then
-avoid_negative_ts is applied last. This is neccessary so that containers
-which do not support negative timestamps wont get any and can be used
-with vsync/async and copyts.
@end table
@c man end FORMAT OPTIONS
diff --git a/doc/ffmpeg.texi b/doc/ffmpeg.texi
index 00c9b25fd4..ca5d652f84 100644
--- a/doc/ffmpeg.texi
+++ b/doc/ffmpeg.texi
@@ -902,6 +902,10 @@ Chooses between 1 and 2 depending on muxer capabilities. This is the
default method.
@end table
+Note that the timestamps may be further modified by the muxer, after this.
+For example, in the case that the format option @option{avoid_negative_ts}
+is enabled.
+
With -map you can select from which stream the timestamps should be
taken. You can leave either video or audio unchanged and sync the
remaining stream(s) to the unchanged one.
@@ -911,6 +915,11 @@ Audio sync method. "Stretches/squeezes" the audio stream to match the timestamps
the parameter is the maximum samples per second by which the audio is changed.
-async 1 is a special case where only the start of the audio stream is corrected
without any later correction.
+
+Note that the timestamps may be further modified by the muxer, after this.
+For example, in the case that the format option @option{avoid_negative_ts}
+is enabled.
+
This option has been deprecated. Use the @code{aresample} audio filter instead.
@item -copyts
@@ -919,7 +928,8 @@ to sanitize them. In particular, do not remove the initial start time
offset value.
Note that, depending on the @option{vsync} option or on specific muxer
-processing, the output timestamps may mismatch with the input
+processing (e.g. in case the format option @option{avoid_negative_ts}
+is enabled) the output timestamps may mismatch with the input
timestamps even when this option is selected.
@item -copytb @var{mode}