Mercurial > mplayer.hg

changeset 21888:b36abbbca01e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
DO NOT recommend or even suggest installing codecs.conf.
author diego
date Sat, 13 Jan 2007 11:57:40 +0000
parents 36cc5a884b6a
children eba1c76f896a
files help/help_mp-en.h mencoder.c mplayer.c
diffstat 3 files changed, 0 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/help/help_mp-en.h	Sat Jan 13 11:49:20 2007 +0000
+++ b/help/help_mp-en.h	Sat Jan 13 11:57:40 2007 +0000
@@ -69,7 +69,6 @@
 #define MSGTR_NoHomeDir "Cannot find HOME directory.\n"
 #define MSGTR_GetpathProblem "get_path(\"config\") problem\n"
 #define MSGTR_CreatingCfgFile "Creating config file: %s\n"
-#define MSGTR_CopyCodecsConf "(Copy/link etc/codecs.conf from the MPlayer sources to ~/.mplayer/codecs.conf)\n"
 #define MSGTR_BuiltinCodecsConf "Using built-in default codecs.conf.\n"
 #define MSGTR_CantLoadFont "Cannot load bitmap font: %s\n"
 #define MSGTR_CantLoadSub "Cannot load subtitles: %s\n"
--- a/mencoder.c	Sat Jan 13 11:49:20 2007 +0000
+++ b/mencoder.c	Sat Jan 13 11:57:40 2007 +0000
@@ -457,7 +457,6 @@
   if(!parse_codec_cfg(get_path("codecs.conf"))){
     if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
       if(!parse_codec_cfg(NULL)){
-	mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
 	mencoder_exit(1,NULL);
       }
       mp_msg(MSGT_MENCODER,MSGL_V,MSGTR_BuiltinCodecsConf);
--- a/mplayer.c	Sat Jan 13 11:49:20 2007 +0000
+++ b/mplayer.c	Sat Jan 13 11:57:40 2007 +0000
@@ -3717,7 +3717,6 @@
   if(!parse_codec_cfg(mem_ptr=get_path("codecs.conf"))){
     if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
       if(!parse_codec_cfg(NULL)){
-	mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf);
         exit_player_with_rc(NULL, 0);
       }
       mp_msg(MSGT_CPLAYER,MSGL_V,MSGTR_BuiltinCodecsConf);