aboutsummaryrefslogtreecommitdiffhomepage
path: root/DOCS
diff options
context:
space:
mode:
authorGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-28 16:18:55 +0000
committerGravatar diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-04-28 16:18:55 +0000
commit136f5763f708fd82782247593f60d158dce26702 (patch)
tree00078d7ae6ebf2ed103ae90e49a0ddb5c255ae96 /DOCS
parent3af0ad0432b057be354ce9010db1203d9b409502 (diff)
Remove outdated and wrong references to codecs.conf.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23161 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'DOCS')
-rw-r--r--DOCS/xml/en/install.xml24
-rw-r--r--DOCS/xml/en/ports.xml8
2 files changed, 5 insertions, 27 deletions
diff --git a/DOCS/xml/en/install.xml b/DOCS/xml/en/install.xml
index f71855034b..bd3b7f9a91 100644
--- a/DOCS/xml/en/install.xml
+++ b/DOCS/xml/en/install.xml
@@ -134,26 +134,10 @@ make install
</para>
<para>
-At this point, <application>MPlayer</application> is ready to use. The
-directory <filename class="directory">$PREFIX/share/mplayer</filename>
-contains the <filename>codecs.conf</filename> file, which is used to tell
-the program all the codecs and their capabilities. This file is needed only
-when you want to change its properties, as the main binary contains an internal
-copy of it. Check if you have
-<filename>codecs.conf</filename> in your home directory
-(<filename>~/.mplayer/codecs.conf</filename>) left from old
-<application>MPlayer</application> versions, and remove it.
-</para>
-
-<para>
-Note that if you have a <filename>codecs.conf</filename> in
-<filename>~/.mplayer/</filename>, the builtin and system
-<filename>codecs.conf</filename> will be ignored completely.
-Do not do this unless you want to fiddle with <application>MPlayer</application>
-internals as this can can cause many problems. If you want to change the codecs
-search order, use the <option>-vc</option>, <option>-ac</option>,
-<option>-vfm</option>, or <option>-afm</option> options either on the command
-line or in your config file (see the manual page).
+At this point, <application>MPlayer</application> is ready to use.
+Check if you have a <filename>codecs.conf</filename> file in your home
+directory at (<filename>~/.mplayer/codecs.conf</filename>) left from old
+<application>MPlayer</application> versions. If you find one, remove it.
</para>
<para>
diff --git a/DOCS/xml/en/ports.xml b/DOCS/xml/en/ports.xml
index 8903a29c03..9a9451ab14 100644
--- a/DOCS/xml/en/ports.xml
+++ b/DOCS/xml/en/ports.xml
@@ -353,20 +353,14 @@ not put it in your global path) then point to the location with:
<para>
Or you can use the default install delivered with IRIX 6.5 in which case
you will have to edit the <filename>Makefile</filename> by hand a little bit.
-Change the following two lines:
+Change the line:
<programlisting>
$(INSTALL) -c -m 644 DOCS/mplayer.1 $(MANDIR)/man1/mplayer.1
-
-$(INSTALL) -c -m 644 etc/codecs.conf $(CONFDIR)/codecs.conf
</programlisting>
to:
<programlisting>
$(INSTALL) -m 644 mplayer.1 $(MANDIR)/man1/
-
-$(INSTALL) -m 644 codecs.conf $(CONFDIR)/
</programlisting>
-And then do (from within the <application>MPlayer</application> source dir):
-<screen>cp DOCS/mplayer.1 . ; cp etc/codecs.conf .</screen>
and then go on with building and installing.
</para>
</sect2>