[Mplayer-cvslog] CVS: main/DOCS/en documentation.html,1.411,1.412 faq.html,1.130,1.131

[Diego Biurrun CVS]

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

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


Index: documentation.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/en/documentation.html,v
retrieving revision 1.411
retrieving revision 1.412
diff -u -r1.411 -r1.412
--- documentation.html	29 Jun 2003 01:20:25 -0000	1.411
+++ documentation.html	9 Jul 2003 17:22:17 -0000	1.412
@@ -814,6 +814,15 @@
   Check if you have <CODE>codecs.conf</CODE> in your home directory
   (<CODE>~/.mplayer/codecs.conf</CODE>) left from old MPlayer versions, and remove it.</P>
 
+<P>Note that if you have a <CODE>codecs.conf</CODE> in <CODE>~/.mplayer/</CODE>,
+  the builtin and system <CODE>codecs.conf</CODE> 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 <CODE>-vc</CODE>, <CODE>-ac</CODE>, <CODE>-vfm</CODE>, or <CODE>-afm</CODE>
+  options either on the command line or in your config file (see the manual
+  page).</P>
+
+
 <P><B>Debian users</B> can build a <CODE>.deb</CODE> package for themselves,
   it's very simple. Just exec <CODE>fakeroot debian/rules binary</CODE> in
   MPlayer's root directory. See

Index: faq.html
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/en/faq.html,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -r1.130 -r1.131
--- faq.html	5 Jul 2003 09:50:21 -0000	1.130
+++ faq.html	9 Jul 2003 17:22:17 -0000	1.131
@@ -464,8 +464,8 @@
 
   <DT>Q: I got this playing MPEG files: Can't find codec for video format
     0x10000001!</DT>
-  <DD>A: You have an old version of codecs.conf at <CODE>~/.mplayer/</CODE>.
-    Upgrade it from <CODE>/etc/</CODE>.<BR>
+  <DD>A: You have an old version of codecs.conf at <CODE>~/.mplayer/</CODE>,
+    <CODE>/etc/</CODE>, <CODE>/usr/local/etc/</CODE> or similar. Remove it.<BR>
     <B>OR</B> you have the <CODE>vc=</CODE> option or something similar in your
     config file(s).</DD>
   <DD>&nbsp;</DD>