diff options
| -rw-r--r-- | mencoder.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mencoder.c b/mencoder.c index f26b94fa7f..6364604f90 100644 --- a/mencoder.c +++ b/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){ |