Mercurial > mplayer.hg

diff mencoder.c @ 8467:3ca9cc46df5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fallback to builtin (generated from etc/codecs.conf at compile time) codecs.conf if no ext configfile found. Based on patch by Sidik Isani <lksi@cfht.hawaii.edu>
author arpi
date Sun, 15 Dec 2002 23:45:19 +0000
parents 42484db3c5b7
children 0b7839c27be9
line wrap: on
line diff
--- a/mencoder.c	Sun Dec 15 21:59:05 2002 +0000
+++ b/mencoder.c	Sun Dec 15 23:45:19 2002 +0000
@@ -369,8 +369,11 @@
 // check codec.conf
 if(!parse_codec_cfg(get_path("codecs.conf"))){
   if(!parse_codec_cfg(CONFDIR"/codecs.conf")){
-    mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
-    mencoder_exit(1,NULL);
+    if(!parse_codec_cfg(NULL)){
+      mp_msg(MSGT_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf);
+      exit(0);
+    }
+    mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_BuiltinCodecsConf);
   }
 }