From 55cd87882c4a16196f075504eef9cc6fa123f98c Mon Sep 17 00:00:00 2001 From: reimar Date: Mon, 28 Sep 2009 11:33:40 +0000 Subject: Document -nosub option git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29731 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'DOCS/man') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index fee7c53f50..11643beebf 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -2341,6 +2341,10 @@ MPlayer prints the available subtitle IDs when run in verbose (\-v) mode. If you cannot select one of the subtitles on a DVD, also try \-vobsubid. . .TP +.B \-nosub +Disables any otherwise auto-selected subtitles (as e.g. the Matroska/mkv demuxer supports). +. +.TP .B \-slang (also see \-sid) Specify a priority list of subtitle languages to use. Different container formats employ different language codes. -- cgit v1.2.3 From e2599009012f958c4328f3b3488e5d2e95fa99b8 Mon Sep 17 00:00:00 2001 From: jrash Date: Thu, 1 Oct 2009 05:41:47 +0000 Subject: sync with en/mplayer.1 r29731 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29746 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/zh_CN/mplayer.1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'DOCS/man') diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1 index 6d30e6a112..0bd744ceaa 100644 --- a/DOCS/man/zh_CN/mplayer.1 +++ b/DOCS/man/zh_CN/mplayer.1 @@ -1,4 +1,4 @@ -.\" sync with en/mplayer.1 r29661 +.\" sync with en/mplayer.1 r29731 .\" Encoding: UTF-8 .\" Reminder of hard terms which need better/final solution later: .\" /capture; playtree in parent list; colorkey; retrace; desync; downmix; @@ -2182,6 +2182,10 @@ MPlayer 运行在 verbose (\-v) 模式时, 打印可用的字幕标识。 如果你不能选择 DVD 中其中之一的字幕, 也请试试 \-vobsubid。 . .TP +.B \-nosub +禁止所有默认情况下自动选择的字幕（就像比如 Matroska/mkv 流分离器所支持的那样）。 +. +.TP .B \-slang <语言代号[,语言代号,...]> (也请参见 \-sid) 指定使用字幕语言的优先级列表。 不同的容器格式使用不同的语言代号。DVDs 使用 ISO 639\-1 的 -- cgit v1.2.3 From cbbc886820e981f488660708678f528e1d243121 Mon Sep 17 00:00:00 2001 From: attila Date: Mon, 5 Oct 2009 12:40:34 +0000 Subject: add a warning to the description of -vf screenshot to add it after all other filters that should apply to it (fix PEBCAK as seen on #mplayer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29752 b3059339-0415-0410-9bf9-f77b7e298cf2 --- DOCS/man/en/mplayer.1 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'DOCS/man') diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 11643beebf..544bce1e4e 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -7318,6 +7318,10 @@ Files named 'shotNNNN.png' will be saved in the working directory, using the first available number \- no files will be overwritten. The filter has no overhead when not used and accepts an arbitrary colorspace, so it is safe to add it to the configuration file. +Make sure that screenshot is added after all other filters that +you want to have applied to it. +E.g. it should be the last filter if you want to have an exact +screenshot of what you see on the monitor. .RE . .TP -- cgit v1.2.3