diff options
| author | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-15 23:45:19 +0000 |
|---|---|---|
| committer | arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-12-15 23:45:19 +0000 |
| commit | d2392f84364e4bf0a61e5c402088c3c8d33098b4 (patch) | |
| tree | 786dc2fe1f3478d2cd91758f0d9450ed0b613116 /mencoder.c | |
| parent | b6ad7ce43d5a94bd8bba42065cff216c5b4ac96d (diff) | |
| download | mpv-d2392f84364e4bf0a61e5c402088c3c8d33098b4.tar.bz2 mpv-d2392f84364e4bf0a61e5c402088c3c8d33098b4.tar.xz | |
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
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 7 |
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); } } |