From d2392f84364e4bf0a61e5c402088c3c8d33098b4 Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 15 Dec 2002 23:45:19 +0000
Subject: 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>

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8468 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mencoder.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'mencoder.c')

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);
   }
 }
 
-- 
cgit v1.2.3