# HG changeset patch
# User nicodvb
# Date 1109922655 0
# Node ID 5146c58fcf240b9194fe52792471fc452dfccd08
# Parent  8511347a0475ebd461420c7104c6522de6fd9a2f
restrictions on muxer's telecine option

diff -r 8511347a0475 -r 5146c58fcf24 DOCS/man/en/mplayer.1
--- a/DOCS/man/en/mplayer.1	Fri Mar 04 07:43:00 2005 +0000
+++ b/DOCS/man/en/mplayer.1	Fri Mar 04 07:50:55 2005 +0000
@@ -7963,13 +7963,15 @@
 .
 .TP
 .B vframerate=<23.976 | 24 | 25 | 29.97 | 30 | 50 | 59.94 | 60 >
-Sets the framerate for MPEG-1/2 video.
+Sets the framerate for MPEG-1/2 video. This option will be ignored if used with 
+option telecine.
 .
 .TP
 .B telecine
 Enables soft telecine mode: the muxer will trick the video stream so as 
 to make it look like encoded at 29.97 or 30 fps; it only works with MPEG-2 
-video when framerate is either 23.976 or 24 fps.
+video when the output framerate, eventually converted with -ofps, is either 
+23.976 or 24 fps. Any other framerate is incompatible with this option.
 .
 .
 .\" --------------------------------------------------------------------------