From 55932536f15ec718d78e72fcc122aebf04a9d735 Mon Sep 17 00:00:00 2001
From: arpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Sun, 28 Apr 2002 17:48:45 +0000
Subject: do cpudetect before anything else

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5890 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 mencoder.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'mencoder.c')

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){
-- 
cgit v1.2.3