Mercurial > mplayer.hg
comparison mplayer.c @ 11759:29eea271490e
add -codecs-file for selecting a specific codecs.conf on the comand line
| author | attila |
|---|---|
| date | Thu, 08 Jan 2004 18:02:31 +0000 |
| parents | bbf3898360e7 |
| children | e6db1c939c25 |
comparison
equal
deleted
inserted
replaced
| 11758:f15a92de64fd | 11759:29eea271490e |
|---|---|
| 891 list_audio_out(); | 891 list_audio_out(); |
| 892 exit(0); | 892 exit(0); |
| 893 } | 893 } |
| 894 | 894 |
| 895 // check codec.conf | 895 // check codec.conf |
| 896 if(!parse_codec_cfg(get_path("codecs.conf"))){ | 896 if(!codecs_file || !parse_codec_cfg(codecs_file)){ |
| 897 if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){ | 897 if(!parse_codec_cfg(get_path("codecs.conf"))){ |
| 898 if(!parse_codec_cfg(NULL)){ | 898 if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){ |
| 899 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf); | 899 if(!parse_codec_cfg(NULL)){ |
| 900 exit(0); | 900 mp_msg(MSGT_CPLAYER,MSGL_HINT,MSGTR_CopyCodecsConf); |
| 901 } | 901 exit(0); |
| 902 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf); | 902 } |
| 903 mp_msg(MSGT_CPLAYER,MSGL_INFO,MSGTR_BuiltinCodecsConf); | |
| 904 } | |
| 903 } | 905 } |
| 904 } | 906 } |
| 905 | 907 |
| 906 #if 0 | 908 #if 0 |
| 907 if(video_codec_list){ | 909 if(video_codec_list){ |