summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-26 00:58:15 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2009-01-26 00:58:15 +0200
commitdd888b05ff3af1c6c35582e75bedae687d38fc66 (patch)
tree7f6f162208cd2d32a6a7ac2cfa886e8befadf4f9 /mplayer.c
parent0406d951209df261970424256d76f293649ec140 (diff)
parent85b28eb411cfa304f1714219ebd17b10a0977fa3 (diff)
downloadmpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.bz2
mpv-dd888b05ff3af1c6c35582e75bedae687d38fc66.tar.xz
Merge svn changes up to r28366
Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c43
1 files changed, 1 insertions, 42 deletions
diff --git a/mplayer.c b/mplayer.c
index e5594f8a7d..57edf9ee91 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -38,8 +38,6 @@
#include <errno.h>
-#include "version.h"
-
#include "mp_msg.h"
#define HELP_MP_DEFINE_STATIC
@@ -79,8 +77,6 @@
#include "osdep/getch2.h"
#include "osdep/timer.h"
-#include "cpudetect.h"
-
#ifdef CONFIG_GUI
#include "gui/interface.h"
#endif
@@ -2407,43 +2403,6 @@ static void pause_loop(struct MPContext *mpctx)
#endif
}
-static void print_version(void){
- mp_msg(MSGT_CPLAYER, MSGL_INFO, "%s\n", MP_TITLE);
-
-/* Test for CPU capabilities (and corresponding OS support) for optimizing */
- GetCpuCaps(&gCpuCaps);
-#if ARCH_X86
- mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
- 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);
-#if HAVE_MMX
- mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX");
-#endif
-#if HAVE_MMX2
- mp_msg(MSGT_CPLAYER,MSGL_INFO," MMX2");
-#endif
-#if HAVE_3DNOW
- mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNow");
-#endif
-#if HAVE_3DNOWEX
- mp_msg(MSGT_CPLAYER,MSGL_INFO," 3DNowEx");
-#endif
-#if HAVE_SSE
- mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE");
-#endif
-#if HAVE_SSE2
- mp_msg(MSGT_CPLAYER,MSGL_INFO," SSE2");
-#endif
- mp_msg(MSGT_CPLAYER,MSGL_INFO,"\n");
-#endif /* RUNTIME_CPUDETECT */
-#endif /* ARCH_X86 */
-}
-
// Find the right mute status and record position for new file position
static void edl_seek_reset(MPContext *mpctx)
@@ -2605,7 +2564,7 @@ int gui_no_filename=0;
// Preparse the command line
m_config_preparse_command_line(mpctx->mconfig,argc,argv);
- print_version();
+ print_version("MPlayer");
#if (defined(__MINGW32__) || defined(__CYGWIN__)) && defined(CONFIG_WIN32DLL)
set_path_env();
#endif