add -codecs-file for selecting a specific codecs.conf on the comand line

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11760 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 8 insertions, 6 deletions

diff --git a/mplayer.c b/mplayer.c
index 5c7a2aadfb..1cfb5cd8d5 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -893,13 +893,15 @@ int gui_no_filename=0;
     }
 
 // check codec.conf
-if(!parse_codec_cfg(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(0);
+if(!codecs_file || !parse_codec_cfg(codecs_file)){
+  if(!parse_codec_cfg(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(0);
+      }
+      mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
     }
-    mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
   }
 }