[MPlayer-cvslog] CVS: main/DOCS/tech codecs.conf.txt,1.6,1.7

[Diego Biurrun CVS]

CVS change done by Diego Biurrun CVS

Update of /cvsroot/mplayer/main/DOCS/tech
In directory mail:/var2/tmp/cvs-serv155/DOCS/tech

Modified Files:
	codecs.conf.txt 
Log Message:
some clarification


Index: codecs.conf.txt
===================================================================
RCS file: /cvsroot/mplayer/main/DOCS/tech/codecs.conf.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- codecs.conf.txt	20 Nov 2004 16:23:10 -0000	1.6
+++ codecs.conf.txt	17 Dec 2004 16:30:05 -0000	1.7
@@ -13,7 +13,9 @@
 users to access, or in the .mplayer directory in a user's home
 directory. When MPlayer starts, it first looks for a codecs.conf file in a
 user's home directory. Failing that, it searches for the shared file. If
-the file has syntax errors, MPlayer will not start and report the error.
+no codecs.conf file is found MPlayer falls back on its internal hardcoded
+configuration. If the file is present but has syntax errors, MPlayer will
+report the error.
 
 The codecs.conf file is really quite simple. It is simply a collection of
 codec definition blocks that define how different media types should be
@@ -96,7 +98,7 @@
 files use to identify codecs. Used only for win32 dshow and DMO codecs.
 
 The "out" keyword identifies which output format the decoder is known
-to output. Just like the fourcc line, there can be multiple out lines or
+to provide. Just like the fourcc line, there can be multiple out lines or
 multiple comma-separated output formats on the same line. The output
 formats should be listed in order of preference.