summaryrefslogtreecommitdiffstats
path: root/DOCS
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-14 17:28:16 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2008-12-14 17:28:16 +0200
commita3ab9e8e4649601281f78949e56b92755ae1142a (patch)
treee31ee1ff4bafbfcf75c16259d9a64d18fea3bd51 /DOCS
parentf01f7f6259badb2725be49af914d8db52e025cf6 (diff)
parentbac1f05b4da4339b487e4e6ab972819142b3f13e (diff)
downloadmpv-a3ab9e8e4649601281f78949e56b92755ae1142a.tar.bz2
mpv-a3ab9e8e4649601281f78949e56b92755ae1142a.tar.xz
Merge svn changes up to r28149
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/man/en/mplayer.14
-rw-r--r--DOCS/man/fr/mplayer.16
-rw-r--r--DOCS/xml/en/install.xml2
-rw-r--r--DOCS/xml/en/ports.xml4
4 files changed, 12 insertions, 4 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1
index 86a3b4c225..ab946c2fd4 100644
--- a/DOCS/man/en/mplayer.1
+++ b/DOCS/man/en/mplayer.1
@@ -4219,6 +4219,10 @@ Each file takes the frame number padded with leading zeros as name.
.IPs z=<0\-9>
Specifies the compression level.
0 is no compression, 9 is maximum compression.
+.IPs alpha (default: noalpha)
+Create PNG files with an alpha channel.
+Note that MPlayer in general does not support alpha, so this will only
+be useful in some rare cases.
.RE
.PD 1
.
diff --git a/DOCS/man/fr/mplayer.1 b/DOCS/man/fr/mplayer.1
index 93494f6cbe..21e3624540 100644
--- a/DOCS/man/fr/mplayer.1
+++ b/DOCS/man/fr/mplayer.1
@@ -1,4 +1,4 @@
-.\" synced with r28096
+.\" synced with r28126
.\" Encoding: iso-8859-1
.\" MPlayer (C) 2000-2008 MPlayer Team
.\" The English man page was/is done by Gabucino, Diego Biurrun, Jonas Jermann
@@ -4459,6 +4459,10 @@ Ne gère que les formats RGB et BGR 24 bits/pixel.
.IPs z=<0\-9>
Définit le taux de compression.
0 équivaut à pas de compression et 9 à la compression maximale.
+.IPs alpha (par défaut\ : noalpha)
+Crée un fichier PNG avec un canal alpha.
+Notez que MPlayer ne gère en général pas les canaux alpha, donc cette
+option sera probablement rarement utile.
.RE
.PD 1
.
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index 25440e429c..fae3bd8618 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -442,7 +442,7 @@ FAAD2 binaries are not available from audiocoding.com, but you can (apt-)get
Debian packages from
<ulink url="http://www.debian-multimedia.org/">Christian Marillat</ulink>,
Mandrake/Mandriva RPMs from the <ulink url="http://plf.zarb.org">P.L.F</ulink>
-and Fedora RPMs from <ulink url="http://rpm.livna.org/">Livna</ulink>.
+and Fedora/CentOS/RHEL RPMs from <ulink url="http://rpmfusion.org/">RPMFusion</ulink>.
</para>
<para>
If you choose to build from source, you do not need all of FAAD2 to decode
diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml
index b752941c1e..29ed6bd422 100644
--- a/DOCS/xml/en/ports.xml
+++ b/DOCS/xml/en/ports.xml
@@ -61,8 +61,8 @@ our binary codec packages for a while, you can (apt-)get them from
<para>
Dominik Mierzejewski maintains the official RPM packages of
-<application>MPlayer</application> for Fedora Core. They are available
-from <ulink url="http://rpm.livna.org/">Livna repository</ulink>.
+<application>MPlayer</application> for Fedora and CentOS/RHEL. They are available
+from <ulink url="http://rpmfusion.org/">RPMFusion repository</ulink>.
</para>
<para>