[Mplayer-cvslog] CVS: main mencoder.c,1.124,1.125

[Arpi of Ize]

Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv11584

Modified Files:
	mencoder.c 
Log Message:
do cpudetect before anything else

Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.124
retrieving revision 1.125
diff -u -r1.124 -r1.125
--- mencoder.c	26 Apr 2002 20:17:15 -0000	1.124
+++ mencoder.c	28 Apr 2002 17:48:45 -0000	1.125
@@ -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);
@@ -350,6 +342,14 @@
       gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
       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