From 1b697bc8d6514a7c3c203d0770b183b7fc395ec4 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Oct 2008 21:54:21 +0000 Subject: whitespace cosmetics git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27690 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 2 -- 1 file changed, 2 deletions(-) (limited to 'DOCS/man/en') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 92febf4f3e..6af1df11f9 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -9095,7 +9095,6 @@ FIXME: Document this. FIXME: Document this. . . -. .SS nuv (\-nuvopts) . Nuppel video is based on RTJPEG and LZO. @@ -10517,7 +10516,6 @@ Encryption key the demuxer should use. This is the raw binary data of the key converted to a hexadecimal string. . . -. .SS FFmpeg libavformat muxers (\-lavfopts) (also see \-of lavf) . .TP -- cgit v1.2.3 From c378cd84bebb84e085576d36f8ee278f5f145994 Mon Sep 17 00:00:00 2001 From: diego Date: Fri, 3 Oct 2008 21:55:05 +0000 Subject: vo_fbdev now supports -geometry. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27691 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'DOCS/man/en') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 6af1df11f9..a63b5e482e 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3080,7 +3080,7 @@ than the screen. .br .I NOTE: This option is only supported by the x11, xmga, xv, xvmc, xvidix, -gl, gl2, directx and tdfxfb video output drivers. +gl, gl2, directx, fbdev and tdfxfb video output drivers. .sp 1 .I EXAMPLE: .PD 0 -- cgit v1.2.3 From b60ab0c001a2b7f9bb7bbbe4779c575357e1b9f1 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Tue, 14 Oct 2008 09:31:19 +0000 Subject: update x264's section with r999 of x264 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27768 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) (limited to 'DOCS/man/en') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index a63b5e482e..177ee191ce 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -10044,7 +10044,7 @@ exhaustive search (very slow, and no better than umh) radius of exhaustive or multi-hexagon motion search (default: 16) . .TP -.B subq=<1\-7> +.B subq=<1\-9> Adjust subpel refinement quality. This parameter controls quality versus speed tradeoffs involved in the motion estimation decision process. @@ -10069,12 +10069,18 @@ Then selects the best type. Then finishes the quarterpixel refinement for that type. .IPs 5 Runs best quality quarterpixel precision motion estimation on all -candidate macroblock types, before selecting the best type (default). +candidate macroblock types, before selecting the best type. +Also refines the two motion vectors used in bidirectional macroblocks, +rather than reusing vectors from the forward and backward searches. .IPs 6 Enables rate-distortion optimization of macroblock types in -I- and P-frames. +I- and P-frames (default). .IPs 7 -Enables rate-distortion optimization of motion vectors and intra modes. (best) +Enables rate-distortion optimization of macroblock types in all frames. +.IPs 8 +Enables rate-distortion optimization of motion vectors in I- and P-frames. +.IPs 9 +Enables rate-distortion optimization of motion vectors in all frames (best). .RE .PD 1 .RS @@ -10096,18 +10102,7 @@ Without this option, a whole macroblock must use the same reference. Requires frameref>1. . .TP -.B (no)brdo -Enables rate-distortion optimization of macroblock types in B-frames. -Requires subq>=6. -. -.TP -.B (no)bime -Refine the two motion vectors used in bidirectional macroblocks, -rather than re-using vectors from the forward and backward searches. -This option has no effect without B-frames. -. -.TP -.B trellis=<0\-2> +.B trellis=<0\-2> (cabac only) rate-distortion optimal quantization .PD 0 .RSs @@ -10121,6 +10116,19 @@ enabled during all mode decisions (slow, requires subq>=6) .PD 1 . .TP +.B psy-rd=rd[:trell] +Sets the strength of the psychovisual optimization. +.PD 0 +.RSs +.IPs rd=<0.0\-10.0> +rate-distortion strength (requires subq>=6) (default: 1.0) +.IPs trell=<0.0\-10.0> +trellis (requires trellis, experimental) (default: 0.0) +.RE +.PD 1 +. +. +.TP .B deadzone_inter=<0\-32> Set the size of the inter luma quantization deadzone for non-trellis quantization (default: 21). -- cgit v1.2.3 From 9ea0b2eeb08c68cb413ede725e78c09b92951870 Mon Sep 17 00:00:00 2001 From: gpoirier Date: Sat, 18 Oct 2008 21:11:44 +0000 Subject: improve documentation of latest x264's options git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27800 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'DOCS/man/en') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 177ee191ce..0cb13bdc40 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -10078,9 +10078,9 @@ I- and P-frames (default). .IPs 7 Enables rate-distortion optimization of macroblock types in all frames. .IPs 8 -Enables rate-distortion optimization of motion vectors in I- and P-frames. +Enables rate-distortion optimization of motion vectors and intra prediction modes in I- and P-frames. .IPs 9 -Enables rate-distortion optimization of motion vectors in all frames (best). +Enables rate-distortion optimization of motion vectors and intra prediction modes in all frames (best). .RE .PD 1 .RS @@ -10121,7 +10121,7 @@ Sets the strength of the psychovisual optimization. .PD 0 .RSs .IPs rd=<0.0\-10.0> -rate-distortion strength (requires subq>=6) (default: 1.0) +psy optimization strength (requires subq>=6) (default: 1.0) .IPs trell=<0.0\-10.0> trellis (requires trellis, experimental) (default: 0.0) .RE -- cgit v1.2.3 From 08ca24c62d1aac0d138b9cd3b9a0c846108d26a9 Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 19 Oct 2008 11:27:10 +0000 Subject: Clarify screenw/screenh options, patch by Christian Ohm, chr.ohm gmx net. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27801 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'DOCS/man/en') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 0cb13bdc40..4b0d562e20 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3206,12 +3206,12 @@ Not supported by all video output drivers. . .TP .B \-screenh -Specify the vertical screen resolution for video output drivers which +Specify the screen height for video output drivers which do not know the screen resolution like fbdev, x11 and TV-out. . .TP .B \-screenw -Specify the horizontal screen resolution for video output drivers which +Specify the screen width for video output drivers which do not know the screen resolution like fbdev, x11 and TV-out. . .TP -- cgit v1.2.3