diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 03:00:14 +0200 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 03:00:14 +0200 |
commit | 240550bbb94653907faa6e0bb1c5ac3d279cc252 (patch) | |
tree | 1cd5346e52515dbeff187d040d79b92fae96caa9 /DOCS | |
parent | 9895f2360fd5e8c48f21117d6934254317891cde (diff) | |
parent | fbb74e16a38d6a5af31a7fb369195988f7414766 (diff) | |
download | mpv-240550bbb94653907faa6e0bb1c5ac3d279cc252.tar.bz2 mpv-240550bbb94653907faa6e0bb1c5ac3d279cc252.tar.xz |
Merge svn changes up to r30848
Diffstat (limited to 'DOCS')
-rw-r--r-- | DOCS/man/en/mplayer.1 | 7 | ||||
-rw-r--r-- | DOCS/man/zh_CN/mplayer.1 | 21 | ||||
-rw-r--r-- | DOCS/tech/mirrors/update_mplayer_rsync | 9 | ||||
-rw-r--r-- | DOCS/tech/nut.txt | 6 | ||||
-rw-r--r-- | DOCS/tech/oggless-xiph-codecs.txt | 6 | ||||
-rw-r--r-- | DOCS/tech/svn-howto.txt | 6 | ||||
-rw-r--r-- | DOCS/xml/en/video.xml | 4 |
7 files changed, 27 insertions, 32 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index 427260187a..beb16e4551 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -3114,13 +3114,16 @@ Fixes fullscreen switching on OpenBox 1.x. .PD 1 . .TP -.B \-geometry x[%][:y[%]] or [WxH][+x+y] +.B \-geometry x[%][:y[%]] or [WxH][+-x+-y] Adjust where the output is on the screen initially. The x and y specifications are in pixels measured from the top-left of the screen to the top-left of the image being displayed, however if a percentage sign is given after the argument it turns the value into a percentage of the screen size in that direction. -It also supports the standard X11 \-geometry option format. +It also supports the standard X11 \-geometry option format, in which e.g. ++10-50 means "place 10 pixels from the left border and 50 pixels from the lower +border" and "--20+-10" means "place 20 pixels beyond the right and 10 pixels +beyond the top border". If an external window is specified using the \-wid option, then the x and y coordinates are relative to the top-left corner of the window rather than the screen. diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1 index 4ea42df5d6..1589cabd78 100644 --- a/DOCS/man/zh_CN/mplayer.1 +++ b/DOCS/man/zh_CN/mplayer.1 @@ -1,4 +1,4 @@ -.\" sync with en/mplayer.1 rev. 30677 +.\" sync with en/mplayer.1 rev. 30822 .\" Encoding: UTF-8 .\" Reminder of hard terms which need better/final solution later: .\" /capture; playtree in parent list; colorkey; retrace; desync; downmix; @@ -2676,11 +2676,11 @@ OS/2 KAI 音频输出驱动 .PD 0 .RSs .IPs uniaud -强制使用 UNIAUD 模式 +强制使用 UNIAUD 模式。 .IPs dart -强制使用 DART 模式 +强制使用 DART 模式。 .IPs (no)share -以共享或独占模式打开音频 +以共享或独占模式打开音频。 .IPs bufsize=<size> 设置缓冲大小为 <size>,以采样数为单位(默认值:2048)。 .RE @@ -2946,13 +2946,14 @@ VESA 帧缓冲不支持改变模式。 .PD 1 . .TP -.B \-geometry x[%][:y[%]] or [WxH][+x+y] +.B \-geometry x[%][:y[%]] 或 [WxH][+-x+-y] 调整屏幕输出的初始位置。 x 和 y 代表从屏幕左上角到显示图像左上角的距离(以像素为单位)。 不过如果在参数值后有百分号记号, 参数值就变为该方向上的屏幕尺寸的百分数。 -它也支持标准 X11 的 \-geometry 选项格式。 -如果使用 \-wid 选项指定了外部窗口, -那么 x 和 y 坐标是相对于窗口而不是屏幕的左上角。 +它也支持标准 X11 的 \-geometry 选项格式。在这种方式下,例如,‘+10-50’表示“放在距左 +边界 10 个像素,距下边界 50 个像素的地方”,而‘--20+-10’表示“放在越出右边界 20 个像 +素,越出上边界 10 个像素的地方。” +如果使用 \-wid 选项指定了外部窗口,那么 x 和 y 坐标是相对于窗口而不是屏幕的左上角。 坐标是相对于 \-xineramascreen 选项给出的屏幕,该屏幕用于完全支持 \-xineramascreen 的 视频输出的驱动(direct3d、gl、gl2、vdpau、x11、xv、xvmc、corevideo)。 The coordinates are relative to the screen given with \-xineramascreen for @@ -5427,6 +5428,10 @@ Completely empties the filter list. 计数值,用以决定多少帧后 cropdetect 将重置先前侦测到的最大视频区域,并重 新侦测当前的最优切割区域。该选项在电视台台标影响了视频区域时可能有用。0 表示从不重置而是返回播放过程中遇到的最大区域。(默认值:0)。 +计数值,用以决定多少帧后 cropdetect 将重置先前侦测到的最大视频区域,并 +重新开始侦测当前的最优切割区域(默认值:0)。 +该选项在频道台标破坏了视频区域的情况下很有效。 +0 代表从不重置并返回整个播放过程中遇到的最大视频区域。 .RE .PD 1 . diff --git a/DOCS/tech/mirrors/update_mplayer_rsync b/DOCS/tech/mirrors/update_mplayer_rsync index cafaabe594..563ec77bc7 100644 --- a/DOCS/tech/mirrors/update_mplayer_rsync +++ b/DOCS/tech/mirrors/update_mplayer_rsync @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # MPlayer mirroring script # $Id$ @@ -10,7 +10,7 @@ MAILADR=<report_mail_to_adr> #TMPDIR = /tmp #export TMPDIR -TMPFILE=`mktemp -t mplayer.XXXXXXXXXXX` +TMPFILE=$(mktemp -t mplayer.XXXXXXXXXXX) # Check to see if another sync is in progress if lockfile -! -l 43200 -r 0 "$LOCK"; then @@ -30,9 +30,8 @@ rsync -pxlrHtWv --delete --delete-after --exclude '/benchmark' \ --exclude '/old_stuff' --exclude '/tests' rsync.mplayerhq.hu::ftp/ \ MPlayer >> $TMPFILE 2>&1 -x=`wc -l $TMPFILE | awk '{print $1}'` -if [ "$x" -ne "10" ] -then +x=$(wc -l $TMPFILE | awk '{print $1}') +if [ "$x" -ne "10" ]; then mailx -s "MPlayer mirror" $MAILADR < $TMPFILE fi rm -f $TMPFILE diff --git a/DOCS/tech/nut.txt b/DOCS/tech/nut.txt deleted file mode 100644 index 0d26d5f42b..0000000000 --- a/DOCS/tech/nut.txt +++ /dev/null @@ -1,6 +0,0 @@ -The NUT specification has been moved to another Subversion repository. -You can find it at: -http://svn.mplayerhq.hu/nut/docs/nut.txt?view=markup - -Its future location will be in a git repository. This file will be -updated when its location changes again. diff --git a/DOCS/tech/oggless-xiph-codecs.txt b/DOCS/tech/oggless-xiph-codecs.txt deleted file mode 100644 index 2b780b70de..0000000000 --- a/DOCS/tech/oggless-xiph-codecs.txt +++ /dev/null @@ -1,6 +0,0 @@ -oggless-xiph-codecs.txt has been moved to another Subversion repository. -You can find it at: -http://svn.mplayerhq.hu/nut/docs/oggless-xiph-codecs.txt?view=markup - -Its future location will be in a git repository. This file will be -updated when its location changes again. diff --git a/DOCS/tech/svn-howto.txt b/DOCS/tech/svn-howto.txt index 054e18b4f3..932dad237d 100644 --- a/DOCS/tech/svn-howto.txt +++ b/DOCS/tech/svn-howto.txt @@ -21,10 +21,14 @@ http://svnbook.org/ For more information about the Subversion project, visit -http://subversion.tigris.org/ +http://subversion.apache.org/ Consult these resources whenever you have problems, they are quite exhaustive. +You do not need a special checkout that works through ssh or similar in order +to be able to commit changes. All you need is the username and password pair +that you received from the MPlayer Subversion server admin. + What follows now is a basic introduction to Subversion and some MPlayer-specific guidelines. Read it at least once, if you are granted commit privileges to the MPlayer project you are expected to be familiar with these rules. diff --git a/DOCS/xml/en/video.xml b/DOCS/xml/en/video.xml index d4eda61ae8..001aaff90b 100644 --- a/DOCS/xml/en/video.xml +++ b/DOCS/xml/en/video.xml @@ -1754,10 +1754,6 @@ If you want to do software transcoding you should have at least a 1GHz CPU. <para> Configure should detect your DVB card. If it did not, force detection with <screen>./configure --enable-dvb</screen> -If you have ost headers at a non-standard path, set the path with -<screen> -./configure --with-extraincdir=<replaceable>DVB source directory</replaceable>/ost/include -</screen> Then compile and install as usual.</para> <formalpara><title>USAGE</title> |