Merge svn changes up to r30967

8 files changed, 8 insertions, 52 deletions

diff --git a/DOCS/man/cs/mplayer.1 b/DOCS/man/cs/mplayer.1
index 174e4f063d..e043066b58 100644
--- a/DOCS/man/cs/mplayer.1
+++ b/DOCS/man/cs/mplayer.1
@@ -10306,12 +10306,6 @@ DODĚLAT: Zdokumentovat.
 .B USERPROFILE
 DODĚLAT: Zdokumentovat.
 .
-.SS libmpcodecs:
-.
-.TP
-.B XANIM_MOD_DIR
-DODĚLAT: Zdokumentovat.
-.
 .SS GUI:
 .
 .TP
diff --git a/DOCS/man/de/mplayer.1 b/DOCS/man/de/mplayer.1
index 12a545157c..635fcdb959 100644
--- a/DOCS/man/de/mplayer.1
+++ b/DOCS/man/de/mplayer.1
@@ -11383,12 +11383,6 @@ FIXME: Muss noch dokumentiert werden.
 .B USERPROFILE
 FIXME: Muss noch dokumentiert werden.
 .
-.SS libmpcodecs:
-.
-.TP
-.B XANIM_MOD_DIR
-FIXME: Muss noch dokumentiert werden.
-.
 .SS GUI:
 .
 .TP
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 46486245ec..5b102868d7 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -3473,8 +3473,7 @@ Select the driver to use as source to overlay on top of X11.
 .PD 1
 .
 .TP
-.B vdpau (with \-vc ffmpeg12vdpau, ffwmv3vdpau, ffvc1vdpau, ffh264vdpau
-or ffodivxvdpau)
+.B vdpau (with \-vc ffmpeg12vdpau, ffwmv3vdpau, ffvc1vdpau, ffh264vdpau or ffodivxvdpau)
 Video output that uses VDPAU to decode video via hardware.
 Also supports displaying of software-decoded video.
 .PD 0
@@ -11302,12 +11301,6 @@ FIXME: Document this.
 .B USERPROFILE
 FIXME: Document this.
 .
-.SS libmpcodecs:
-.
-.TP
-.B XANIM_MOD_DIR
-FIXME: Document this.
-.
 .SS GUI:
 .
 .TP
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index 6209931071..cf33b922c8 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -11695,12 +11695,6 @@ FIXME: Documente ceci.
 .B USERPROFILE
 FIXME: Documente ceci.
 .
-.SS libmpcodecs:
-.
-.TP
-.B XANIM_MOD_DIR
-FIXME: Documente ceci.
-.
 .SS GUI:
 .
 .TP
diff --git a/DOCS/man/hu/mplayer.1 b/DOCS/man/hu/mplayer.1
index e81f276a82..ce0edb7e43 100644
--- a/DOCS/man/hu/mplayer.1
+++ b/DOCS/man/hu/mplayer.1
@@ -11168,12 +11168,6 @@ FIXME: Ezt m�g dokument�lni kell.
 .B USERPROFILE
 FIXME: Ezt m�g dokument�lni kell.
 .
-.SS libmpcodecs:
-.
-.TP
-.B XANIM_MOD_DIR
-FIXME: Ezt m�g dokument�lni kell.
-.
 .SS GUI:
 .
 .TP
diff --git a/DOCS/man/it/mplayer.1 b/DOCS/man/it/mplayer.1
index 391ad7571f..26d6bd3220 100644
--- a/DOCS/man/it/mplayer.1
+++ b/DOCS/man/it/mplayer.1
@@ -11631,12 +11631,6 @@ FIXME: Da documentare.
 .B USERPROFILE
 FIXME: Da documentare.
 .
-.SS libmpcodecs:
-.
-.TP
-.B XANIM_MOD_DIR
-FIXME: Da documentare.
-.
 .SS GUI:
 .
 .TP
diff --git a/DOCS/man/ru/mplayer.1 b/DOCS/man/ru/mplayer.1
index 5a958c27d4..fdfd02db68 100644
--- a/DOCS/man/ru/mplayer.1
+++ b/DOCS/man/ru/mplayer.1
@@ -11271,12 +11271,6 @@ FIXME: ������� ���.
 .B USERPROFILE
 FIXME: ������� ���.
 .
-.SS libmpcodecs:
-.
-.TP
-.B XANIM_MOD_DIR
-FIXME: ������� ���.
-.
 .SS GUI:
 .
 .TP
diff --git a/DOCS/man/zh_CN/mplayer.1 b/DOCS/man/zh_CN/mplayer.1
index fdc0d0f7ae..cd25a33084 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. 30868
+.\" sync with en/mplayer.1 rev. 30936
 .\" Encoding: UTF-8
 .\" Reminder of hard terms which need better/final solution later:
 .\"   /capture; playtree in parent list; colorkey; retrace; desync; downmix;
@@ -625,6 +625,11 @@ lavcopts=mbd=2:trell=yes:v4mv=yes
 .SH "通用选项"
 .
 .TP
+.B \-codecpath <dir>
+指定已编译编解码器的存放目录。
+Specify a directory for binary codecs.
+.
+.TP
 .B \-codecs\-file <文件名>（也请参见 \-afm，\-ac，\-vfm，\-vc）
 重载标准的搜索路径并使用指定的文件代替内置的 codecs.conf。
 .
@@ -3271,7 +3276,7 @@ ggi 和 gl2 的都支持此功能。
 .PD 1
 .
 .TP
-.B vdpau（与 \-vc ffmpeg12vdpau，ffwmv3vdpau，ffvc1vdpau，ffh264vdpau 或
+.B vdpau（与 \-vc ffmpeg12vdpau，ffwmv3vdpau，ffvc1vdpau，ffh264vdpau 或 
 ffodivxvdpau 一同使用）
 使用 VDPAU 硬件解码视频的视频输出方式。
 同时支持显示软件解码的视频。
@@ -10560,12 +10565,6 @@ FIXME: 待解释。
 .B USERPROFILE
 FIXME: 待解释。
 .
-.SS libmpcodecs:
-.
-.TP
-.B XANIM_MOD_DIR
-FIXME: 待解释。
-.
 .SS GUI:
 .
 .TP