mirror of
https://github.com/mpv-player/mpv
synced 2025-03-04 21:27:58 +00:00
do cpudetect before anything else
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5890 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
aa97b0e2c0
commit
55932536f1
16
mencoder.c
16
mencoder.c
@ -334,14 +334,6 @@ unsigned int timer_start;
|
||||
mp_msg_set_level(MSGL_STATUS);
|
||||
mp_msg(MSGT_CPLAYER,MSGL_INFO,"%s",banner_text);
|
||||
|
||||
// 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);
|
||||
}
|
||||
}
|
||||
|
||||
/* Test for cpu capabilities (and corresponding OS support) for optimizing */
|
||||
#ifdef ARCH_X86
|
||||
GetCpuCaps(&gCpuCaps);
|
||||
@ -351,6 +343,14 @@ if(!parse_codec_cfg(get_path("codecs.conf"))){
|
||||
gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
|
||||
#endif
|
||||
|
||||
// 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);
|
||||
}
|
||||
}
|
||||
|
||||
// check font
|
||||
#ifdef USE_OSD
|
||||
if(font_name){
|
||||
|
Loading…
Reference in New Issue
Block a user