# HG changeset patch
# User ranma
# Date 1079921520 0
# Node ID 30d292e0beb74518cb5cc0e4d1688f3d7f2589eb
# Parent  cdf62dc6d6a0a2f3a5b5e16d932001d168c30c6e
Include the comments from -aviaspect into the description of -useaviaspect and remove -aviaspect

diff -r cdf62dc6d6a0 -r 30d292e0beb7 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Mon Mar 22 01:42:43 2004 +0000
+++ b/DOCS/man/en/mplayer.1	Mon Mar 22 02:12:00 2004 +0000
@@ -364,12 +364,29 @@
 Particularly useful on slow terminals or broken ones that do not properly
 handle carriage return (i.e. \\r).
 .TP
+.B \-useaviaspect
+With this option MPlayer and MEncoder will read and write the aspect
+setting from the OpenDML AVI Video Property Header.
+
+This is a different method than the "aspect=..." option of
+libavcodec or XviD, and is prioritized over it during playback,
+because this header is processed first.
+
+Generally, encoding AVIs with square pixels is still the best
+choice, so aspect headers should be avoided.
+Some players can understand it, while they may not understand the
+aspect headers produced by the codec.
+
+.I EXAMPLE:
+.PD 0
+.RSs
+.IPs "\-aspect 16:9 \-useaviaspect"
+will add a header specifying 16:9 aspect ratio.
+.RE
+.PD 1
+.TP
 .B \-v, \-verbose
 Increment verbose level (more \-v means more verbosity).
-.TP
-.B \-useaviaspect
-With this option MPlayer and MEncoder will read and write the aspect setting
-from the OpenDML Video Property Header.
 .
 .PD 0
 .RSs
@@ -3745,31 +3762,6 @@
 .B \-audio-preload <0.0\-2.0>
 Sets up audio buffering time interval (default: 0.5s).
 .TP
-.B \-aviaspect <w:h>
-Encode an additional AVI header with aspect ratio.
-This is a different method than the "aspect=..." option of
-libavcodec or XviD, and is prioritized over it during playback,
-because this header is processed first.
-
-This option is included for completeness.
-Some players can understand it, while they do not understand the
-aspect headers produced by the codec.
-If you wish to target such a player, use this option.
-Generally, encoding AVIs with square pixels is still the best
-choice, so aspect headers should be avoided.
-Only use this option if you know what you are doing.
-Avoid using it together with the aspect option of the codec, as it
-could give unpredictable results.
-
-.I EXAMPLE:
-.PD 0
-.RSs
-.IPs "\-aviaspect 16:9"
-will add a header specifying 16:9 aspect ratio.
-.RE
-.PD 1
-.
-.TP
 .B \-endpos <[[hh:]mm:]ss[.ms]|size[b|kb|mb]> (see \-ss and \-sb option too)
 Stop encoding at given time or byte position.
 Can be specified in many ways: