summaryrefslogtreecommitdiffstats
path: root/DOCS/man
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 18:59:15 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-03-09 18:59:15 +0200
commitb0986b3760b0174be6a58e1754353102f3230c79 (patch)
tree0c9f5a05216a547ae4ddf3b2669749f88ec3f801 /DOCS/man
parent5fc54a6caad5f24b993da2e282c896269a6abc49 (diff)
parent23db422c3d40a5202d61b5ca154cf5286d9ac0a5 (diff)
downloadmpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.bz2
mpv-b0986b3760b0174be6a58e1754353102f3230c79.tar.xz
Merge svn changes up to r30463
Note that r30455 is wrong, that commit does not in fact change the default behavior as claimed in the commit message. It only breaks "-af-adv force=0", which was already pretty much useless though.
Diffstat (limited to 'DOCS/man')
-rw-r--r--DOCS/man/zh_CN/mplayer.19
1 files changed, 7 insertions, 2 deletions
diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1
index f19c81b37b..83bcde4f7e 100644
--- a/DOCS/man/zh_CN/mplayer.1
+++ b/DOCS/man/zh_CN/mplayer.1
@@ -1,4 +1,4 @@
-.\" sync with en/mplayer.1 r30336
+.\" sync with en/mplayer.1 r30436
.\" Encoding: UTF-8
.\" Reminder of hard terms which need better/final solution later:
.\" /capture; playtree in parent list; colorkey; retrace; desync; downmix;
@@ -5388,7 +5388,7 @@ Completely empties the filter list.
.PD 1
.
.TP
-.B cropdetect[=0\-255]
+.B cropdetect[=limit:round[:reset]]
计算必要的切割参数并把推荐值显示在标准输出上。
.PD 0
.RSs
@@ -5400,6 +5400,11 @@ Completely empties the filter list.
偏移值将被自动调整以使视频位于屏幕中心。
使用 2 以只得到偶数尺寸( 4:2:2 的视频需要此选项)。
16 对于大多数编码器的编码来说是很适合的。
+.br
+.IPs <reset>
+计数值,用以决定多少帧后 cropdetect 将重置先前侦测到的最大视频区域,并重
+新侦测当前的最优切割区域。该选项在电视台台标影响了视频区域时可能有用。0
+表示从不重置而是返回播放过程中遇到的最大区域。(默认值:0)。
.RE
.PD 1
.