summaryrefslogtreecommitdiffstats
path: root/mencoder.c
diff options
context:
space:
mode:
Diffstat (limited to 'mencoder.c')
-rw-r--r--mencoder.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/mencoder.c b/mencoder.c
index 7c5c2d7b92..91ef4c28c6 100644
--- a/mencoder.c
+++ b/mencoder.c
@@ -369,8 +369,11 @@ unsigned int timer_start;
// 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);
}
}