Mercurial > mplayer.hg
changeset 5889:111d2406a87a
do cpudetect before anything else
author | arpi |
---|---|
date | Sun, 28 Apr 2002 17:48:45 +0000 |
parents | 90730a179d18 |
children | f3283d1c7e41 |
files | mencoder.c |
diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/mencoder.c Sun Apr 28 17:46:15 2002 +0000 +++ b/mencoder.c Sun Apr 28 17:48:45 2002 +0000 @@ -334,14 +334,6 @@ 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 @@ 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){