summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-06-05 23:34:17 +0300
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-06-05 23:35:42 +0300
commitdde8b753e417bb44e5f18ac9d6901deb95bf6ab0 (patch)
tree84fc2a73fc1f514417cacd61c9a57580ca47cd66 /DOCS
parent331167ae132d35c821510307d8dd109ce27bfc1b (diff)
parent09bca6575f66394e1f4ba3845330d21d30895f3d (diff)
downloadmpv-dde8b753e417bb44e5f18ac9d6901deb95bf6ab0.tar.bz2
mpv-dde8b753e417bb44e5f18ac9d6901deb95bf6ab0.tar.xz
Merge svn changes r31318 to r31328
r31328 is a somewhat questionable (changing the option at that point isn't quite safe), but it was a failure case already...
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.14
-rw-r--r--DOCS/man/zh_CN/mplayer.115
2 files changed, 9 insertions, 10 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 8ac123a948..6303db7c83 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -4356,7 +4356,9 @@ Transforms the video stream into a sequence of uncompressed YUV 4:2:0
images and stores it in a file (default: ./stream.yuv).
The format is the same as the one employed by mjpegtools, so this is
useful if you want to process the video with the mjpegtools suite.
-It supports the YV12, RGB (24 bpp) and BGR (24 bpp) format.
+It supports the YV12 format.
+If your source file has a different format and is interlaced, make sure
+to use -vf scale=::1 to ensure the conversion uses interlaced mode.
You can combine it with the \-fixed\-vo option to concatenate files
with the same dimensions and fps value.
.PD 0
diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1
index 30cc8a3c5a..cfbf87341d 100644
--- a/DOCS/man/zh_CN/mplayer.1
+++ b/DOCS/man/zh_CN/mplayer.1
@@ -1,18 +1,10 @@
-.\" sync with en/mplayer.1 rev. 31173
+.\" sync with en/mplayer.1 rev. 31292
.\" Encoding: UTF-8
-.\" Reminder of hard terms which need better/final solution later:
-.\" /capture; playtree in parent list; colorkey; retrace; desync; downmix;
-.\" wrapper script ... shellescapes; keyframe; deblock; dering;
-.\" encoding audio rate; alphamap; upsampling; sweep;
-.\" aligned buffers; instancenumber;
.\"
.\" MPlayer (C) 2000-2010 MPlayer 团队
.\" 本(英文)手册页由 Gabucino, Diego Biurrun, Jonas Jermann 编写
.\" 视频滤镜、通用编解码器选项、特定编解码器专用选项三个章节由
.\" JRaSH <jrash06 AT 163.com>重新翻译
-.\" 参于翻译本中文手册页的有:
-.\" JRaSH <jrash06 AT 163.com>,
-.\" Lu Ran <hephooey@fastmail.fm>, Sheldon Jin <jinsh2 AT yahoo.com>,
.
.\" --------------------------------------------------------------------------
.\" 宏定义
@@ -1116,6 +1108,7 @@ MPlayer 从标准输入读取以新行 (\\n) 分隔开的命令行,
选择 AC-3 音频流的动态范围压缩(DRC)级别。
<级别> 是 0 到 1 的浮点数, 其中 0 表示无压缩,
(默认值) 1 表示全压缩 (使得响亮的通路更安静或相反)。
+可使用大于 2 的值,但仅供试验。
此选项仅当 AC-3 流包含所需范围的压缩信息时显示效果。
.
.TP
@@ -1687,6 +1680,10 @@ radio://1, radio://104.4, radio_set_channel 1
.PD 1
.
.TP
+.B \-referrer <字符串>(仅用于网络环境)
+为 HTTP 请求指定引用页面的路径或 URL。
+.
+.TP
.B \-rtsp\-port
与 "rtsp://" 的 URL 地址一起用来锁定客户端的端口号。
如果你在路由器后面, 想把 RTSP 流从服务器转到指定客户端, 此选项可能有用。