aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--XBMC-ATV2.xcodeproj/project.pbxproj4
-rw-r--r--XBMC-IOS.xcodeproj/project.pbxproj4
-rw-r--r--XBMC.xcodeproj/project.pbxproj6
-rw-r--r--configure.in9
-rw-r--r--xbmc/DllPaths_generated.h.in1
-rw-r--r--xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h77
6 files changed, 45 insertions, 56 deletions
diff --git a/XBMC-ATV2.xcodeproj/project.pbxproj b/XBMC-ATV2.xcodeproj/project.pbxproj
index 9299d2f29b..3abb76b737 100644
--- a/XBMC-ATV2.xcodeproj/project.pbxproj
+++ b/XBMC-ATV2.xcodeproj/project.pbxproj
@@ -900,7 +900,6 @@
F589AE1B1288DE0800D8079E /* libsamplerate.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE1A1288DE0800D8079E /* libsamplerate.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
F589AE1D1288DE1B00D8079E /* libcdio.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE1C1288DE1B00D8079E /* libcdio.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
F589AE211288DE6400D8079E /* libfribidi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE201288DE6400D8079E /* libfribidi.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
- F589AE291288DE9600D8079E /* libmpeg2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE281288DE9600D8079E /* libmpeg2.dylib */; settings = {ATTRIBUTES = (Required, ); }; };
F589AE2F1288DEC900D8079E /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE2E1288DEC900D8079E /* libcrypto.dylib */; };
F589AE311288DEE000D8079E /* libpcre.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE301288DEE000D8079E /* libpcre.dylib */; };
F589AE331288DEE900D8079E /* libpcrecpp.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F589AE321288DEE900D8079E /* libpcrecpp.dylib */; };
@@ -2838,7 +2837,6 @@
F589AE1C1288DE1B00D8079E /* libcdio.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcdio.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libcdio.dylib"; sourceTree = "<absolute>"; };
F589AE1E1288DE2700D8079E /* libfreetype.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfreetype.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libfreetype.dylib"; sourceTree = "<absolute>"; };
F589AE201288DE6400D8079E /* libfribidi.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfribidi.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libfribidi.dylib"; sourceTree = "<absolute>"; };
- F589AE281288DE9600D8079E /* libmpeg2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmpeg2.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libmpeg2.dylib"; sourceTree = "<absolute>"; };
F589AE2E1288DEC900D8079E /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libcrypto.dylib"; sourceTree = "<absolute>"; };
F589AE301288DEE000D8079E /* libpcre.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpcre.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libpcre.dylib"; sourceTree = "<absolute>"; };
F589AE321288DEE900D8079E /* libpcrecpp.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpcrecpp.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libpcrecpp.dylib"; sourceTree = "<absolute>"; };
@@ -2882,7 +2880,6 @@
F589AE1B1288DE0800D8079E /* libsamplerate.dylib in Frameworks */,
F589AE1D1288DE1B00D8079E /* libcdio.dylib in Frameworks */,
F589AE211288DE6400D8079E /* libfribidi.dylib in Frameworks */,
- F589AE291288DE9600D8079E /* libmpeg2.dylib in Frameworks */,
F589AE2F1288DEC900D8079E /* libcrypto.dylib in Frameworks */,
F589AE311288DEE000D8079E /* libpcre.dylib in Frameworks */,
F589AE331288DEE900D8079E /* libpcrecpp.dylib in Frameworks */,
@@ -5709,7 +5706,6 @@
F589AE2E1288DEC900D8079E /* libcrypto.dylib */,
F5B13B011333248E0045076D /* libass.dylib */,
F54D9DD712B56A7D006870F9 /* libfaad.dylib */,
- F589AE281288DE9600D8079E /* libmpeg2.dylib */,
F589AE201288DE6400D8079E /* libfribidi.dylib */,
F589AE1C1288DE1B00D8079E /* libcdio.dylib */,
F589AE1A1288DE0800D8079E /* libsamplerate.dylib */,
diff --git a/XBMC-IOS.xcodeproj/project.pbxproj b/XBMC-IOS.xcodeproj/project.pbxproj
index a191be0b8e..f1dc7f7d7d 100644
--- a/XBMC-IOS.xcodeproj/project.pbxproj
+++ b/XBMC-IOS.xcodeproj/project.pbxproj
@@ -888,7 +888,6 @@
F56C8BEB131F4796000AD0F6 /* libpcrecpp.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8BD2131F4795000AD0F6 /* libpcrecpp.dylib */; };
F56C8BEC131F4796000AD0F6 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8BD3131F4795000AD0F6 /* libcrypto.dylib */; };
F56C8BEE131F4796000AD0F6 /* libfaad.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8BD5131F4796000AD0F6 /* libfaad.dylib */; };
- F56C8BEF131F4796000AD0F6 /* libmpeg2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8BD6131F4796000AD0F6 /* libmpeg2.dylib */; };
F56C8BF5131F4796000AD0F6 /* libfribidi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8BDC131F4796000AD0F6 /* libfribidi.dylib */; };
F56C8BF6131F4796000AD0F6 /* libcdio.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8BDD131F4796000AD0F6 /* libcdio.dylib */; };
F56C8BF7131F4796000AD0F6 /* libsamplerate.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8BDE131F4796000AD0F6 /* libsamplerate.dylib */; };
@@ -2823,7 +2822,6 @@
F56C8BD2131F4795000AD0F6 /* libpcrecpp.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpcrecpp.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libpcrecpp.dylib"; sourceTree = "<absolute>"; };
F56C8BD3131F4795000AD0F6 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libcrypto.dylib"; sourceTree = "<absolute>"; };
F56C8BD5131F4796000AD0F6 /* libfaad.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfaad.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libfaad.dylib"; sourceTree = "<absolute>"; };
- F56C8BD6131F4796000AD0F6 /* libmpeg2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmpeg2.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libmpeg2.dylib"; sourceTree = "<absolute>"; };
F56C8BDC131F4796000AD0F6 /* libfribidi.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfribidi.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libfribidi.dylib"; sourceTree = "<absolute>"; };
F56C8BDD131F4796000AD0F6 /* libcdio.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcdio.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libcdio.dylib"; sourceTree = "<absolute>"; };
F56C8BDE131F4796000AD0F6 /* libsamplerate.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsamplerate.dylib; path = "/Users/Shared/xbmc-depends/ios-4.2_arm7/lib/libsamplerate.dylib"; sourceTree = "<absolute>"; };
@@ -2898,7 +2896,6 @@
F56C8BEB131F4796000AD0F6 /* libpcrecpp.dylib in Frameworks */,
F56C8BEC131F4796000AD0F6 /* libcrypto.dylib in Frameworks */,
F56C8BEE131F4796000AD0F6 /* libfaad.dylib in Frameworks */,
- F56C8BEF131F4796000AD0F6 /* libmpeg2.dylib in Frameworks */,
F56C8BF5131F4796000AD0F6 /* libfribidi.dylib in Frameworks */,
F56C8BF6131F4796000AD0F6 /* libcdio.dylib in Frameworks */,
F56C8BF7131F4796000AD0F6 /* libsamplerate.dylib in Frameworks */,
@@ -5707,7 +5704,6 @@
F56C8BD3131F4795000AD0F6 /* libcrypto.dylib */,
F5B13AFD1333247D0045076D /* libass.dylib */,
F56C8BD5131F4796000AD0F6 /* libfaad.dylib */,
- F56C8BD6131F4796000AD0F6 /* libmpeg2.dylib */,
F56C8BDC131F4796000AD0F6 /* libfribidi.dylib */,
F56C8BDD131F4796000AD0F6 /* libcdio.dylib */,
F56C8BDE131F4796000AD0F6 /* libsamplerate.dylib */,
diff --git a/XBMC.xcodeproj/project.pbxproj b/XBMC.xcodeproj/project.pbxproj
index 1032954e6c..524d38d055 100644
--- a/XBMC.xcodeproj/project.pbxproj
+++ b/XBMC.xcodeproj/project.pbxproj
@@ -1155,7 +1155,6 @@
F56C8D44131F5E85000AD0F6 /* libpcre.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D2B131F5E84000AD0F6 /* libpcre.dylib */; };
F56C8D45131F5E85000AD0F6 /* libpcrecpp.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D2C131F5E84000AD0F6 /* libpcrecpp.dylib */; };
F56C8D46131F5E85000AD0F6 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D2D131F5E84000AD0F6 /* libcrypto.dylib */; };
- F56C8D49131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */; };
F56C8D4F131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */; };
F56C8D50131F5E85000AD0F6 /* libcdio.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D37131F5E85000AD0F6 /* libcdio.dylib */; };
F56C8D51131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */; };
@@ -1170,7 +1169,6 @@
F56C8D5C131F5E85000AD0F6 /* libpcre.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D2B131F5E84000AD0F6 /* libpcre.dylib */; };
F56C8D5D131F5E85000AD0F6 /* libpcrecpp.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D2C131F5E84000AD0F6 /* libpcrecpp.dylib */; };
F56C8D5E131F5E85000AD0F6 /* libcrypto.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D2D131F5E84000AD0F6 /* libcrypto.dylib */; };
- F56C8D61131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */; };
F56C8D67131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */; };
F56C8D68131F5E85000AD0F6 /* libcdio.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D37131F5E85000AD0F6 /* libcdio.dylib */; };
F56C8D69131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */; };
@@ -3674,7 +3672,6 @@
F56C8D2B131F5E84000AD0F6 /* libpcre.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpcre.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libpcre.dylib"; sourceTree = "<absolute>"; };
F56C8D2C131F5E84000AD0F6 /* libpcrecpp.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpcrecpp.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libpcrecpp.dylib"; sourceTree = "<absolute>"; };
F56C8D2D131F5E84000AD0F6 /* libcrypto.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcrypto.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libcrypto.dylib"; sourceTree = "<absolute>"; };
- F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libmpeg2.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libmpeg2.dylib"; sourceTree = "<absolute>"; };
F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libfribidi.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libfribidi.dylib"; sourceTree = "<absolute>"; };
F56C8D37131F5E85000AD0F6 /* libcdio.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libcdio.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libcdio.dylib"; sourceTree = "<absolute>"; };
F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsamplerate.dylib; path = "/Users/Shared/xbmc-depends/osx-10.4_i386/lib/libsamplerate.dylib"; sourceTree = "<absolute>"; };
@@ -3872,7 +3869,6 @@
F56C8D44131F5E85000AD0F6 /* libpcre.dylib in Frameworks */,
F56C8D45131F5E85000AD0F6 /* libpcrecpp.dylib in Frameworks */,
F56C8D46131F5E85000AD0F6 /* libcrypto.dylib in Frameworks */,
- F56C8D49131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */,
F56C8D4F131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */,
F56C8D50131F5E85000AD0F6 /* libcdio.dylib in Frameworks */,
F56C8D51131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */,
@@ -3931,7 +3927,6 @@
F56C8D5C131F5E85000AD0F6 /* libpcre.dylib in Frameworks */,
F56C8D5D131F5E85000AD0F6 /* libpcrecpp.dylib in Frameworks */,
F56C8D5E131F5E85000AD0F6 /* libcrypto.dylib in Frameworks */,
- F56C8D61131F5E85000AD0F6 /* libmpeg2.dylib in Frameworks */,
F56C8D67131F5E85000AD0F6 /* libfribidi.dylib in Frameworks */,
F56C8D68131F5E85000AD0F6 /* libcdio.dylib in Frameworks */,
F56C8D69131F5E85000AD0F6 /* libsamplerate.dylib in Frameworks */,
@@ -6860,7 +6855,6 @@
F56C8D2C131F5E84000AD0F6 /* libpcrecpp.dylib */,
F56C8D2D131F5E84000AD0F6 /* libcrypto.dylib */,
F5B13AD0133319310045076D /* libass.dylib */,
- F56C8D30131F5E84000AD0F6 /* libmpeg2.dylib */,
F56C8D36131F5E85000AD0F6 /* libfribidi.dylib */,
F56C8D37131F5E85000AD0F6 /* libcdio.dylib */,
F56C8D38131F5E85000AD0F6 /* libsamplerate.dylib */,
diff --git a/configure.in b/configure.in
index 32f3dc8c10..42bb404cd8 100644
--- a/configure.in
+++ b/configure.in
@@ -561,8 +561,6 @@ AC_CHECK_LIB([lzo2], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([z], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([ssl], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([crypto], [main],, AC_MSG_ERROR($missing_library))
-AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library))
-AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([mysqlclient], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([ssh], [sftp_tell64],, AC_MSG_RESULT([Could not find suitable version of libssh]))
AC_CHECK_LIB([smbclient], [main],, AC_MSG_ERROR($missing_library))
@@ -622,6 +620,8 @@ AS_CASE([x$use_libbluray],
# platform dependent libraries
if test "$host_vendor" = "apple" ; then
+ AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_HEADER([mpeg2dec/mpeg2convert.h],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([iconv], [main],, AC_MSG_ERROR($missing_library))
if test "$use_arch" != "arm"; then
AC_CHECK_LIB([SDL_mixer],[main],, AC_MSG_ERROR($missing_library))
@@ -636,6 +636,8 @@ else
AC_CHECK_LIB([SDL_image], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([modplug], [main],, AC_MSG_ERROR($missing_library))
AC_CHECK_LIB([wavpack], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([mpeg2], [main],, AC_MSG_ERROR($missing_library))
+ AC_CHECK_LIB([mpeg2convert],[main],, AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([ALSA], [alsa],
[INCLUDES="$INCLUDES $ALSA_CFLAGS"; LIBS="$LIBS $ALSA_LIBS"],
@@ -687,6 +689,7 @@ XB_FIND_SONAME([VORBISENC], [vorbisenc])
XB_FIND_SONAME([VORBISFILE], [vorbisfile])
XB_FIND_SONAME([MODPLUG], [modplug])
if test "$host_vendor" = "apple"; then
+ XB_FIND_SONAME([MPEG2], [mpeg2])
XB_FIND_SONAME([WAVPACK], [wavpack])
fi
@@ -1422,7 +1425,6 @@ AC_SUBST(SDL_DEFINES)
AC_SUBST(BUILD_DVDCSS)
AC_SUBST(BUILD_GOOM)
AC_SUBST(USE_EXTERNAL_FFMPEG)
-AC_SUBST(USE_EXTERNAL_LIBMPEG2)
AC_SUBST(USE_EXTERNAL_PYTHON)
AC_SUBST(USE_PYTHON2_6)
AC_SUBST(USE_PYTHON2_5)
@@ -1439,6 +1441,7 @@ AC_SUBST(LIBOGG_BASENAME)
AC_SUBST(LIBVORBISENC_BASENAME)
AC_SUBST(LIBVORBIS_BASENAME)
AC_SUBST(LIBWAVPACK_BASENAME)
+AC_SUBST(LIBMEPG2_BASENAME)
AC_SUBST_FILE(XBMC_STANDALONE_SH_PULSE)
AC_SUBST(USE_OPENGL)
AC_SUBST(USE_OPENGLES)
diff --git a/xbmc/DllPaths_generated.h.in b/xbmc/DllPaths_generated.h.in
index 134c007f6f..c0ab61f15f 100644
--- a/xbmc/DllPaths_generated.h.in
+++ b/xbmc/DllPaths_generated.h.in
@@ -69,6 +69,7 @@
/* dvdplayer */
#define DLL_PATH_LIBDVDNAV "special://xbmcbin/system/players/dvdplayer/libdvdnav-@ARCH@.so"
+#define DLL_PATH_LIBMPEG2 "@MPEG2_SONAME@"
#define DLL_PATH_LIBMAD "@MAD_SONAME@"
/* ffmpeg */
diff --git a/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h b/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
index 2d710a8fd9..c94f5d1c5d 100644
--- a/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
+++ b/xbmc/cores/dvdplayer/DVDCodecs/Video/DllLibMpeg2.h
@@ -25,12 +25,12 @@
#include "config.h"
#endif
extern "C" {
-#if (!defined WIN32)
- #include <mpeg2dec/mpeg2.h>
- #include <mpeg2dec/mpeg2convert.h>
-#else
+#if defined(WIN32)
#include "libmpeg2/mpeg2.h"
#include "libmpeg2/mpeg2convert.h"
+#else
+ #include <mpeg2dec/mpeg2.h>
+ #include <mpeg2dec/mpeg2convert.h>
#endif
}
#include "DynamicDll.h"
@@ -54,7 +54,40 @@ public:
virtual void mpeg2_skip(mpeg2dec_t * mpeg2dec, int skip)=0;
};
-#if (!defined WIN32)
+#if defined(WIN32) || defined(__APPLE__)
+
+class DllLibMpeg2 : public DllDynamic, DllLibMpeg2Interface
+{
+ DECLARE_DLL_WRAPPER(DllLibMpeg2, DLL_PATH_LIBMPEG2)
+ DEFINE_METHOD1(uint32_t, mpeg2_accel, (uint32_t p1))
+ DEFINE_METHOD0(mpeg2dec_t *, mpeg2_init)
+ DEFINE_METHOD1(const mpeg2_info_t *, mpeg2_info, (mpeg2dec_t * p1))
+ DEFINE_METHOD1(void, mpeg2_close, (mpeg2dec_t * p1))
+ DEFINE_METHOD3(void, mpeg2_buffer, (mpeg2dec_t * p1, uint8_t * p2, uint8_t * p3))
+ DEFINE_METHOD3(void, mpeg2_tag_picture, (mpeg2dec_t * p1, uint32_t p2, uint32_t p3))
+ DEFINE_METHOD1(mpeg2_state_t, mpeg2_parse, (mpeg2dec_t * p1))
+ DEFINE_METHOD2(void, mpeg2_reset, (mpeg2dec_t * p1, int p2))
+ DEFINE_METHOD3(void, mpeg2_set_buf, (mpeg2dec_t * p1, uint8_t * p2[3], void * p3))
+ DEFINE_METHOD2(void, mpeg2_custom_fbuf, (mpeg2dec_t * p1, int p2))
+ DEFINE_METHOD3(int, mpeg2_convert, (mpeg2dec_t * p1, mpeg2_convert_t p2, void * p3))
+ DEFINE_METHOD2(void,mpeg2_skip, (mpeg2dec_t * p1, int p2))
+ BEGIN_METHOD_RESOLVE()
+ RESOLVE_METHOD(mpeg2_accel)
+ RESOLVE_METHOD(mpeg2_init)
+ RESOLVE_METHOD(mpeg2_info)
+ RESOLVE_METHOD(mpeg2_close)
+ RESOLVE_METHOD(mpeg2_buffer)
+ RESOLVE_METHOD(mpeg2_tag_picture)
+ RESOLVE_METHOD(mpeg2_parse)
+ RESOLVE_METHOD(mpeg2_reset)
+ RESOLVE_METHOD(mpeg2_set_buf)
+ RESOLVE_METHOD(mpeg2_custom_fbuf)
+ RESOLVE_METHOD(mpeg2_convert)
+ RESOLVE_METHOD(mpeg2_skip)
+ END_METHOD_RESOLVE()
+};
+
+#else
class DllLibMpeg2 : public DllDynamic, DllLibMpeg2Interface
{
@@ -93,38 +126,4 @@ public:
}
virtual void Unload() {}
};
-
-#else
-
-class DllLibMpeg2 : public DllDynamic, DllLibMpeg2Interface
-{
- DECLARE_DLL_WRAPPER(DllLibMpeg2, DLL_PATH_LIBMPEG2)
- DEFINE_METHOD1(uint32_t, mpeg2_accel, (uint32_t p1))
- DEFINE_METHOD0(mpeg2dec_t *, mpeg2_init)
- DEFINE_METHOD1(const mpeg2_info_t *, mpeg2_info, (mpeg2dec_t * p1))
- DEFINE_METHOD1(void, mpeg2_close, (mpeg2dec_t * p1))
- DEFINE_METHOD3(void, mpeg2_buffer, (mpeg2dec_t * p1, uint8_t * p2, uint8_t * p3))
- DEFINE_METHOD3(void, mpeg2_tag_picture, (mpeg2dec_t * p1, uint32_t p2, uint32_t p3))
- DEFINE_METHOD1(mpeg2_state_t, mpeg2_parse, (mpeg2dec_t * p1))
- DEFINE_METHOD2(void, mpeg2_reset, (mpeg2dec_t * p1, int p2))
- DEFINE_METHOD3(void, mpeg2_set_buf, (mpeg2dec_t * p1, uint8_t * p2[3], void * p3))
- DEFINE_METHOD2(void, mpeg2_custom_fbuf, (mpeg2dec_t * p1, int p2))
- DEFINE_METHOD3(int, mpeg2_convert, (mpeg2dec_t * p1, mpeg2_convert_t p2, void * p3))
- DEFINE_METHOD2(void,mpeg2_skip, (mpeg2dec_t * p1, int p2))
- BEGIN_METHOD_RESOLVE()
- RESOLVE_METHOD(mpeg2_accel)
- RESOLVE_METHOD(mpeg2_init)
- RESOLVE_METHOD(mpeg2_info)
- RESOLVE_METHOD(mpeg2_close)
- RESOLVE_METHOD(mpeg2_buffer)
- RESOLVE_METHOD(mpeg2_tag_picture)
- RESOLVE_METHOD(mpeg2_parse)
- RESOLVE_METHOD(mpeg2_reset)
- RESOLVE_METHOD(mpeg2_set_buf)
- RESOLVE_METHOD(mpeg2_custom_fbuf)
- RESOLVE_METHOD(mpeg2_convert)
- RESOLVE_METHOD(mpeg2_skip)
- END_METHOD_RESOLVE()
-};
-
#endif
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-21 09:22:25 +0000