Fix goom to use av_get_cpu_flags() from current ffmpeg

MythTV · Apr 12, 2012 · 75eafd4 · 75eafd4
1 parent 449d36d
commit 75eafd4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/mythplugins/mythmusic/mythmusic/goom/mmx.h b/mythplugins/mythmusic/mythmusic/goom/mmx.h
@@ -1,10 +1,9 @@
 #ifndef GOOM_MMX_H
 
 #include <mythconfig.h>
+#include <libavcodec/avcodec.h>
 #include <libavcodec/mmx.h>
 
-int mm_support(void);
-
 #define MM_MMX    0x0001 /* standard MMX */
 #define MM_3DNOW  0x0004 /* AMD 3DNOW */
 #define MM_MMXEXT 0x0002 /* SSE integer functions or AMD MMX ext */

diff --git a/mythplugins/mythmusic/mythmusic/goom/zoom_filter_xmmx.c b/mythplugins/mythmusic/mythmusic/goom/zoom_filter_xmmx.c
@@ -27,7 +27,7 @@ int 	zoom_filter_xmmx_supported (void);
 #include "mmx.h"
 
 int zoom_filter_xmmx_supported () {
-	return (mm_support()&0x8)>>3;
+    return (av_get_cpu_flags() & AV_CPU_FLAG_SSE) >> 3;
 }
 
 void zoom_filter_xmmx (int prevX, int prevY,

diff --git a/mythtv/libs/libmythtv/visualisations/goom/mmx.h b/mythtv/libs/libmythtv/visualisations/goom/mmx.h
@@ -3,8 +3,6 @@
 #include <mythconfig.h>
 #include "libavcodec/x86/mmx.h"
 
-int mm_support(void);
-
 #define MM_MMX    0x0001 /* standard MMX */
 #define MM_3DNOW  0x0004 /* AMD 3DNOW */
 #define MM_MMXEXT 0x0002 /* SSE integer functions or AMD MMX ext */

diff --git a/mythtv/libs/libmythtv/visualisations/goom/zoom_filter_xmmx.c b/mythtv/libs/libmythtv/visualisations/goom/zoom_filter_xmmx.c
@@ -25,9 +25,10 @@ int 	zoom_filter_xmmx_supported (void);
 
 //#define MMX_TRACE
 #include "mmx.h"
+#include "libavutil/cpu.h"
 
 int zoom_filter_xmmx_supported () {
-	return (mm_support()&0x8)>>3;
+    return (av_get_cpu_flags() & AV_CPU_FLAG_SSE) >> 3;
 }
 
 void zoom_filter_xmmx (int prevX, int prevY,