[Mplayer-cvslog] CVS: main/DOCS/xml/en faq.xml,1.6,1.7 install.xml,1.9,1.10

[Diego Biurrun CVS]

Update of /cvsroot/mplayer/main/DOCS/xml/en
In directory mail:/var/tmp.root/cvs-serv6915/en

Modified Files:
	faq.xml install.xml 
Log Message:
Strings attached to codecs.conf explained.
Based on a patch by Andrew Church <achurch at achurch.org>.


Index: faq.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/faq.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- faq.xml	5 Jul 2003 09:42:35 -0000	1.6
+++ faq.xml	9 Jul 2003 17:35:34 -0000	1.7
@@ -664,8 +664,9 @@
 </para></question>
 <answer><para>
 You have an old version of <filename>codecs.conf</filename> at
-<filename class="directory">~/.mplayer/</filename>. Upgrade it from
-<filename class="directory">/etc/</filename>.
+<filename class="directory">~/.mplayer/</filename>,
+<filename class="directory">/etc/</filename>,
+<filename class="directory">/usr/local/etc/</filename> or similar. Remove it.
 <emphasis role="bold">OR</emphasis> you have the <option>vc=</option> option or
 something similar in your config file(s).
 </para></answer>

Index: install.xml
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/xml/en/install.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- install.xml	11 Jun 2003 00:39:50 -0000	1.9
+++ install.xml	9 Jul 2003 17:35:34 -0000	1.10
@@ -449,6 +449,18 @@
 </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 MPlayer 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).
+</para>
+
+
+<para>
 Debian users can build a .deb package for themselves, it's very simple.
 Just exec
 <screen>fakeroot debian/rules binary</screen>