# HG changeset patch # User alex # Date 1058870782 0 # Node ID b411916cb86ad53d604c95d5c219555fe7d7efba # Parent 4eaf6fa120b1f5a058e01f10db238ce86b043ac8 sync the basic mplayer and mencoder outputs diff -r 4eaf6fa120b1 -r b411916cb86a mencoder.c --- a/mencoder.c Mon Jul 21 21:02:34 2003 +0000 +++ b/mencoder.c Tue Jul 22 10:46:22 2003 +0000 @@ -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")){ diff -r 4eaf6fa120b1 -r b411916cb86a mplayer.c --- a/mplayer.c Mon Jul 21 21:02:34 2003 +0000 +++ b/mplayer.c Tue Jul 22 10:46:22 2003 +0000 @@ -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