summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-08-19 21:15:02 +0000
committerDiego Biurrun <diego@biurrun.de>2006-08-19 21:15:02 +0000
commit29c9183cb5aeb0864966d6259a468c1ebd8740bd (patch)
tree98ed0f0f104800e5dd458879edb51b33d4d54533 /doc
parent67eca72dc0183025397191dbf93e1e5033354afb (diff)
spelling fixes for the last commit
Originally committed as revision 6031 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'doc')
-rw-r--r--doc/ffmpeg-doc.texi8
1 files changed, 4 insertions, 4 deletions
diff --git a/doc/ffmpeg-doc.texi b/doc/ffmpeg-doc.texi
index c9b7c22994..1b96a26675 100644
--- a/doc/ffmpeg-doc.texi
+++ b/doc/ffmpeg-doc.texi
@@ -505,12 +505,12 @@ streams. This option is used for automatic FFserver testing.
Repeatedly loop output for formats that support looping such as animated GIF
(0 will loop the output infinitely).
@item -vsync parameter
-Video sync method. Video will be stretched/sqeezed to match the timestamps,
-it is done by duplicating and droping frames. With -map you can select from
-which stream the timestamps should be taken, you can leave either video or
+Video sync method. Video will be stretched/squeezed to match the timestamps,
+it is done by duplicating and dropping frames. 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.
@item -async samples_per_second
-Audio sync method. "Stretches/sqeezes" the audio stream to match the timestamps,
+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.