[MPlayer-dev-eng] [PATCH] Do not read codecs.conf files by default

[Diego Biurrun]

I've had enough.

codecs.conf files continue doing damage in the wild.  This patch removes
support for reading it from default locations.  It's still possible to
use the -codecs-file option, so devs can put

codecs-file=/path/to/somewhere

in their config file if they wish.  The rest of the world will be spared
the troubles with codecs.conf for good.

Something similar has to be done for mencoder.c of course, I'll do that
at commit time if necessary.

Diego
-------------- next part --------------
Index: mplayer.c
===================================================================
--- mplayer.c	(revision 21906)
+++ mplayer.c	(working copy)
@@ -3714,15 +3714,10 @@
 
 /* Check codecs.conf. */
 if(!codecs_file || !parse_codec_cfg(codecs_file)){
-  if(!parse_codec_cfg(mem_ptr=get_path("codecs.conf"))){
-    if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
       if(!parse_codec_cfg(NULL)){
         exit_player_with_rc(NULL, 0);
       }
       mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_BuiltinCodecsConf);
-    }
-  }
-  free( mem_ptr ); // release the buffer created by get_path()
 }
 
 #if 0