diff options
author | elupus <elupus@svn> | 2010-08-26 23:25:48 +0000 |
---|---|---|
committer | elupus <elupus@svn> | 2010-08-26 23:25:48 +0000 |
commit | a75e23544612c4e519d5e22f0ca2980e782138f7 (patch) | |
tree | 71c3aae7f7dc50ff1e3cf0ab403324837c793b93 /guilib | |
parent | 82230a7108cee6d26c6f102ecde595dbadf06a73 (diff) |
backport: bluray plaback support based on libbluray
r33147 [WIN32] r33145 for VS2010 - bluray support
r33145 [WIN32] build xbmc with support for libbluray
r33144 [WIN32] added libbluray headers, dll and how to build the dll
r32602 changed, install libbluray into /usr/lib on Linux because XB_FIND_SONAME can't find it in /usr/local/lib, revert later
r32564 add libbluray download/makefile
r32562 opps, copy/paste monster bites again
r32561 changed, dyload libbluray instead of static linking it
r32398 cleanup: leftover from libbdnav removal
r32329 fixed: yet another leftover from libbdnav removal
r32326 fixed: removed now deleted libbdnav from build system
r32319 removed: old libbdnav sources aswell as the old mpls playback code.
r32261 added: support stacking with libbluray
r32236 fix compile error is HAVE_LIBBLURAY not defined
r32234 changed: generalize the SeekTime inputstream interface
r32233 changed: make chapter support from input stream a general interface
r32232 added: support for using libbluray to play bdmv files (index.bdmv or *.mpls)
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@33193 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib')
-rw-r--r-- | guilib/system.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/guilib/system.h b/guilib/system.h index 70467da782..26f23633ba 100644 --- a/guilib/system.h +++ b/guilib/system.h @@ -99,6 +99,7 @@ #define USE_LIBDTS_DECODER #define HAS_AC3_CDDA_CODEC #define HAS_LIBRTMP +#define HAVE_LIBBLURAY #endif /***************** @@ -112,7 +113,6 @@ #define HAS_SDL_AUDIO #define HAS_SDL_OPENGL #define HAS_SDL_WIN_EVENTS -#define HAS_LIBBDNAV #endif /***************** @@ -142,7 +142,6 @@ #ifdef HAVE_LIBXRANDR #define HAS_XRANDR #endif -#define HAS_LIBBDNAV #endif #ifdef HAVE_LIBSSH @@ -224,6 +223,7 @@ #define HAS_GLES 1 #endif + #ifdef HAS_GL #ifdef _WIN32 #include "GL/glew.h" |