From 1c5251d47f8f0d10ddda9d7e08aeebbcb47ef8f7 Mon Sep 17 00:00:00 2001 From: alex Date: Tue, 22 Jul 2003 10:46:22 +0000 Subject: [PATCH] sync the basic mplayer and mencoder outputs git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10454 b3059339-0415-0410-9bf9-f77b7e298cf2 --- mencoder.c | 26 +++++++++++++++++++++++++- mplayer.c | 2 +- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/mencoder.c b/mencoder.c index 257dcb976c..a4af295517 100644 --- a/mencoder.c +++ b/mencoder.c @@ -368,8 +368,32 @@ unsigned int timer_start; 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")){ diff --git a/mplayer.c b/mplayer.c index c0cc2dfc15..b903043ab7 100644 --- a/mplayer.c +++ b/mplayer.c @@ -756,7 +756,7 @@ int gui_no_filename=0; 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