[Mplayer-cvslog] CVS: main mplayer.c,1.707,1.708 mencoder.c,1.216,1.217
Alex Beregszaszi
alex at mplayerhq.hu
Tue Jul 22 12:46:46 CEST 2003
Update of /cvsroot/mplayer/main
In directory mail:/var/tmp.root/cvs-serv26294
Modified Files:
mplayer.c mencoder.c
Log Message:
sync the basic mplayer and mencoder outputs
Index: mplayer.c
===================================================================
RCS file: /cvsroot/mplayer/main/mplayer.c,v
retrieving revision 1.707
retrieving revision 1.708
diff -u -r1.707 -r1.708
--- mplayer.c 13 Jul 2003 15:38:33 -0000 1.707
+++ mplayer.c 22 Jul 2003 10:46:22 -0000 1.708
@@ -756,7 +756,7 @@
mp_msg_init();
mp_msg_set_level(MSGL_STATUS);
- mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2003 MPlayer Team\n");
+ mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2003 MPlayer Team\n\n");
/* Test for cpu capabilities (and corresponding OS support) for optimizing */
GetCpuCaps(&gCpuCaps);
#ifdef ARCH_X86
Index: mencoder.c
===================================================================
RCS file: /cvsroot/mplayer/main/mencoder.c,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -r1.216 -r1.217
--- mencoder.c 13 Jul 2003 15:38:33 -0000 1.216
+++ mencoder.c 22 Jul 2003 10:46:22 -0000 1.217
@@ -368,8 +368,32 @@
gCpuCaps.cpuType,gCpuCaps.hasMMX,gCpuCaps.hasMMX2,
gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
gCpuCaps.hasSSE, gCpuCaps.hasSSE2);
+#ifdef RUNTIME_CPUDETECT
+ mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithRuntimeDetection);
+#else
+ mp_msg(MSGT_CPLAYER,MSGL_INFO, MSGTR_CompiledWithCPUExtensions);
+#ifdef HAVE_MMX
+ mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX");
#endif
-
+#ifdef HAVE_MMX2
+ mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2");
+#endif
+#ifdef HAVE_3DNOW
+ mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow");
+#endif
+#ifdef HAVE_3DNOWEX
+ mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx");
+#endif
+#ifdef HAVE_SSE
+ mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE");
+#endif
+#ifdef HAVE_SSE2
+ mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2");
+#endif
+ mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n\n");
+#endif
+#endif
+
// check codec.conf
if(!parse_codec_cfg(get_path("codecs.conf"))){
if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
More information about the MPlayer-cvslog
mailing list