diff options
| author | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-08 18:02:31 +0000 |
|---|---|---|
| committer | attila <attila@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2004-01-08 18:02:31 +0000 |
| commit | fab8cc090f72e42d8a451a2fffa0ed1935782d1e (patch) | |
| tree | 0e8a22b6bc493b523c94bcf45905487dc302d8bf /mencoder.c | |
| parent | 1afd8710b474de134d6707386cd73125d504b883 (diff) | |
| download | mpv-fab8cc090f72e42d8a451a2fffa0ed1935782d1e.tar.bz2 mpv-fab8cc090f72e42d8a451a2fffa0ed1935782d1e.tar.xz | |
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
Diffstat (limited to 'mencoder.c')
| -rw-r--r-- | mencoder.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mencoder.c b/mencoder.c index b15d475994..2f9e3e87c2 100644 --- a/mencoder.c +++ b/mencoder.c @@ -406,13 +406,15 @@ unsigned int timer_start; InitTimer(); // 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_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf); - mencoder_exit(1,NULL); +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_MENCODER,MSGL_HINT,MSGTR_CopyCodecsConf); + mencoder_exit(1,NULL); + } + mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_BuiltinCodecsConf); } - mp_msg(MSGT_MENCODER,MSGL_INFO,MSGTR_BuiltinCodecsConf); } } |