summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-16 09:52:52 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-05-16 09:52:52 +0000
commit3e739b70b21abcb2091aa3b5db2a30f857bbbe3f (patch)
tree2e74bada2784f90b99e8a4b65a8bdf44ed95107b /DOCS
parenteaa8e3bcb63facd521bf2b5c76829a8d8c39050c (diff)
downloadmpv-3e739b70b21abcb2091aa3b5db2a30f857bbbe3f.tar.bz2
mpv-3e739b70b21abcb2091aa3b5db2a30f857bbbe3f.tar.xz
Fix imprecise fps numbers, patch by Corey Hickey <bugfood-ml at fatooh dot org>.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15488 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.16
-rw-r--r--DOCS/xml/en/mencoder.xml28
2 files changed, 17 insertions, 17 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 65872013ea..73e4ce9dc8 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -33,7 +33,7 @@
.\" Title
.\" --------------------------------------------------------------------------
.
-.TH MPlayer 1 "2005-04-03" "The MPlayer Project" "The Movie Player"
+.TH MPlayer 1 "2005-05-15" "The MPlayer Project" "The Movie Player"
.
.SH NAME
mplayer \- movie player
@@ -8181,9 +8181,9 @@ This option will be ignored if used with the telecine option.
.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
+to make it look like encoded at 30000/1001 or 30 fps; it only works with MPEG-2
video when the output framerate, eventually converted with \-ofps, is either
-23.976 or 24 fps.
+24000/1001 or 24 fps.
Any other framerate is incompatible with this option.
.
.
diff --git a/DOCS/xml/en/mencoder.xml b/DOCS/xml/en/mencoder.xml
index 09f573f669..7c0baf1428 100644
--- a/DOCS/xml/en/mencoder.xml
+++ b/DOCS/xml/en/mencoder.xml
@@ -571,7 +571,7 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
</para></listitem>
<listitem><para>
<emphasis role="bold">NTSC Video</emphasis>: Recorded with an
- NTSC video camera at 59.94 fields per second, or 60 fields per
+ NTSC video camera at 60000/1001 fields per second, or 60 fields per
second in the pre-color era.
Otherwise similar to PAL.
</para></listitem>
@@ -581,7 +581,7 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
</para></listitem>
<listitem><para>
<emphasis role="bold">Computer Graphics (CG)</emphasis>: Can be
- any framerate, but some are more common than others; 23 and
+ any framerate, but some are more common than others; 24 and
30 frames per second are typical for NTSC, and 25fps is typical
for PAL.
</para></listitem>
@@ -643,7 +643,7 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
shown alternately for the duration of 3 fields or 2 fields.
This gives a fieldrate 2.5 times the original framerate.
The result is also slowed down very slightly from 60 fields per
- second to 59.94 fields per second to maintain NTSC fieldrate.
+ second to 60000/1001 fields per second to maintain NTSC fieldrate.
</para></listitem>
<listitem><para>
<emphasis role="bold">NTSC 2:2 pulldown</emphasis>: Used for
@@ -692,29 +692,29 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
<title>NTSC regions:</title>
<listitem><para>
If <application>MPlayer</application> prints that the framerate
- has changed to 23.976 when watching your movie, and never changes
- back, it is almost certainly 24fps content that has been
+ has changed to 24000/1001 when watching your movie, and never changes
+ back, it is almost certainly progressive content that has been
"soft telecined".
</para></listitem>
<listitem><para>
If <application>MPlayer</application> shows the framerate
- switching back and forth between 23.976 and 29.97, and you see
+ switching back and forth between 24000/1001 and 30000/1001, and you see
"combing" at times, then there are several possibilities.
- The 23.976 fps segments are almost certainly 24fps progressive
- content, "soft telecined", but the 29.97 fps parts could be
- either hard-telecined 24fps content or NTSC video content.
+ The 24000/1001 fps segments are almost certainly progressive
+ content, "soft telecined", but the 30000/1001 fps parts could be
+ either hard-telecined 24000/1001 fps content or 60000/1001 fields per second NTSC video.
Use the same guidelines as the following two cases to determine
which.
</para></listitem>
<listitem><para>
If <application>MPlayer</application> never shows the framerate
changing, and every single frame with motion appears combed, your
- movie is NTSC video at 59.94 fields per second.
+ movie is NTSC video at 60000/1001 fields per second.
</para></listitem>
<listitem><para>
If <application>MPlayer</application> never shows the framerate
changing, and two frames out of every five appear combed, your
- movie is "hard telecined" 24fps content.
+ movie is "hard telecined" 24000/1001fps content.
</para></listitem>
</itemizedlist>
@@ -1610,8 +1610,8 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
deinterlace or not.
While deinterlacing will make your movie usable on progressive
scan displays such a computer monitors and projectors, it comes
- at a cost: The fieldrate of 50 or 59.94 fields per second
- is halved to 25 or 29.97 frames per second, and roughly half of
+ at a cost: The fieldrate of 50 or 60000/1001 fields per second
+ is halved to 25 or 30000/1001 frames per second, and roughly half of
the information in your movie will be lost during scenes with
significant motion.
</para>
@@ -1622,7 +1622,7 @@ vcodec=mpeg2video:intra_matrix=8,9,12,22,26,27,29,34,9,10,14,26,27,29,34,37,
You can always deinterlace the movie at playback time when
displaying it on progressive scan devices, and future players will
be able to deinterlace to full fieldrate, interpolating 50 or
- 59.94 entire frames per second from the interlaced video.
+ 60000/1001 entire frames per second from the interlaced video.
</para>
<para>