summaryrefslogtreecommitdiffstats
path: root/mpcommon.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 /mpcommon.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 'mpcommon.c')
-rw-r--r--mpcommon.c51
1 files changed, 51 insertions, 0 deletions
diff --git a/mpcommon.c b/mpcommon.c
index d07e4eb27c..4c6c780a7b 100644
--- a/mpcommon.c
+++ b/mpcommon.c
@@ -7,7 +7,11 @@
#include "mplayer.h"
#include "libvo/sub.h"
#include "libvo/video_out.h"
+#include "cpudetect.h"
+#include "help_mp.h"
+#include "mp_msg.h"
#include "spudec.h"
+#include "version.h"
#include "vobsub.h"
#ifdef CONFIG_TV_TELETEXT
#include "stream/tv.h"
@@ -26,6 +30,53 @@ ass_track_t* ass_track = 0; // current track to render
sub_data* subdata = NULL;
subtitle* vo_sub_last = NULL;
+
+void print_version(const char* name)
+{
+ mp_msg(MSGT_CPLAYER, MSGL_INFO, MP_TITLE, name);
+
+ /* Test for CPU capabilities (and corresponding OS support) for optimizing */
+ GetCpuCaps(&gCpuCaps);
+#if ARCH_X86
+ mp_msg(MSGT_CPLAYER, MSGL_V,
+ "CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNowExt: %d SSE: %d SSE2: %d SSSE3: %d\n",
+ gCpuCaps.hasMMX, gCpuCaps.hasMMX2,
+ gCpuCaps.has3DNow, gCpuCaps.has3DNowExt,
+ gCpuCaps.hasSSE, gCpuCaps.hasSSE2, gCpuCaps.hasSSSE3);
+#ifdef RUNTIME_CPUDETECT
+ mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithRuntimeDetection);
+#else
+ mp_msg(MSGT_CPLAYER,MSGL_V, MSGTR_CompiledWithCPUExtensions);
+#if HAVE_MMX
+ mp_msg(MSGT_CPLAYER,MSGL_V," MMX");
+#endif
+#if HAVE_MMX2
+ mp_msg(MSGT_CPLAYER,MSGL_V," MMX2");
+#endif
+#if HAVE_3DNOW
+ mp_msg(MSGT_CPLAYER,MSGL_V," 3DNow");
+#endif
+#if HAVE_3DNOWEXT
+ mp_msg(MSGT_CPLAYER,MSGL_V," 3DNowExt");
+#endif
+#if HAVE_SSE
+ mp_msg(MSGT_CPLAYER,MSGL_V," SSE");
+#endif
+#if HAVE_SSE2
+ mp_msg(MSGT_CPLAYER,MSGL_V," SSE2");
+#endif
+#if HAVE_SSSE3
+ mp_msg(MSGT_CPLAYER,MSGL_V," SSSE3");
+#endif
+#if HAVE_CMOV
+ mp_msg(MSGT_CPLAYER,MSGL_V," CMOV");
+#endif
+ mp_msg(MSGT_CPLAYER,MSGL_V,"\n");
+#endif /* RUNTIME_CPUDETECT */
+#endif /* ARCH_X86 */
+}
+
+
void update_subtitles(sh_video_t *sh_video, demux_stream_t *d_dvdsub, int reset)
{
struct MPOpts *opts = sh_video->opts;