Browse files

Update mythmusic for new ffmpex-mmx.h header

Following 106132b, forgot to also updates the plugins
  • Loading branch information...
1 parent 106132b commit 3a29f2fcd895984652b7ecf69b480ac93fe898ea @jyavenard jyavenard committed May 22, 2012
View
2 mythplugins/mythmusic/mythmusic/goom/mmx.h
@@ -2,7 +2,7 @@
#include <mythconfig.h>
#include <libavcodec/avcodec.h>
-#include <libavcodec/mmx.h>
+#include <ffmpeg-mmx.h>
#define MM_MMX 0x0001 /* standard MMX */
#define MM_3DNOW 0x0004 /* AMD 3DNOW */
View
7 mythtv/libs/libmythbase/ffmpeg-mmx.h
@@ -21,9 +21,9 @@
#ifndef AVCODEC_X86_MMX_H
#define AVCODEC_X86_MMX_H
-/* Removed by MythTV. We will keep this file for a while :-)
-#warning Everything in this header is deprecated, use plain asm()! New code using this header will be rejected.
-*/
+#include <mythconfig.h>
+
+#if HAVE_MMX
/*
* The type of an value that fits in an MMX register (note that long
@@ -307,5 +307,6 @@ typedef union {
#define punpcklqdq_r2r(regs,regd) mmx_r2r (punpcklqdq, regs, regd)
#define punpckhqdq_r2r(regs,regd) mmx_r2r (punpckhqdq, regs, regd)
+#endif
#endif /* AVCODEC_X86_MMX_H */
View
3 mythtv/libs/libmythbase/libmythbase.pro
@@ -25,6 +25,7 @@ HEADERS += mythhttppool.h mythhttphandler.h mythdeque.h mythlogging.h
HEADERS += mythbaseutil.h referencecounter.h version.h mythcommandlineparser.h
HEADERS += mythscheduler.h filesysteminfo.h hardwareprofile.h serverpool.h
HEADERS += plist.h bswap.h
+HEADERS += ffmpeg-mmx.h
SOURCES += mthread.cpp mthreadpool.cpp
SOURCES += mythsocket.cpp mythsocketthread.cpp msocketdevice.cpp
@@ -66,7 +67,7 @@ inc.files += mythtranslation.h iso639.h iso3166.h mythmedia.h mythmiscutil.h
inc.files += mythcdrom.h autodeletedeque.h dbutil.h mythhttppool.h mythdeque.h
inc.files += referencecounter.h mythcommandlineparser.h mthread.h mthreadpool.h
inc.files += filesysteminfo.h hardwareprofile.h bonjourregister.h serverpool.h
-inc.files += plist.h bswap.h
+inc.files += plist.h bswap.h ffmpeg-mmx.h
# Allow both #include <blah.h> and #include <libmythbase/blah.h>
inc2.path = $${PREFIX}/include/mythtv/libmythbase

0 comments on commit 3a29f2f

Please sign in to comment.