vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Fri Dec 27 11:15:17 2013 +0100| [647aa514349409aa3179e76235a2f65d0921aaae] | committer: Jean-Baptiste Kempf
Require libbluray 0.3.0 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=647aa514349409aa3179e76235a2f65d0921aaae --- configure.ac | 2 +- contrib/src/bluray/rules.mak | 2 +- modules/access/bluray.c | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/configure.ac b/configure.ac index d60eae3..bf7e769 100644 --- a/configure.ac +++ b/configure.ac @@ -1695,7 +1695,7 @@ AS_IF([test "${enable_dvdnav}" != "no"], [ dnl dnl Blu-ray Disc Support with libbluray dnl -PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.2.1], (libbluray for Blu-ray disc support ) ) +PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.3.0], (libbluray for Blu-ray disc support ) ) dnl dnl OpenCV wrapper and example filters diff --git a/contrib/src/bluray/rules.mak b/contrib/src/bluray/rules.mak index d5bd7b8..22f577d 100644 --- a/contrib/src/bluray/rules.mak +++ b/contrib/src/bluray/rules.mak @@ -3,7 +3,7 @@ ifdef BUILD_DISCS PKGS += bluray endif -ifeq ($(call need_pkg,"libbluray >= 0.2.1"),) +ifeq ($(call need_pkg,"libbluray >= 0.3.0"),) PKGS_FOUND += bluray endif diff --git a/modules/access/bluray.c b/modules/access/bluray.c index 0b98815..2efde4c 100644 --- a/modules/access/bluray.c +++ b/modules/access/bluray.c @@ -205,9 +205,7 @@ static void blurayInitTitles(demux_t *p_demux, int menu_titles); static int bluraySetTitle(demux_t *p_demux, int i_title); static void blurayOverlayProc(void *ptr, const BD_OVERLAY * const overlay); -#if BLURAY_VERSION >= BLURAY_VERSION_CODE(0,3,0) static void blurayArgbOverlayProc(void *ptr, const BD_ARGB_OVERLAY * const overlay); -#endif static int onMouseEvent(vlc_object_t *p_vout, const char *psz_var, vlc_value_t old, vlc_value_t val, void *p_data); @@ -401,11 +399,9 @@ static int blurayOpen(vlc_object_t *object) goto error; } -#if BLURAY_VERSION >= BLURAY_VERSION_CODE(0,3,0) /* Register ARGB overlay handler for BD-J */ if (disc_info->num_bdj_titles) bd_register_argb_overlay_proc(p_sys->bluray, p_demux, blurayArgbOverlayProc, NULL); -#endif /* libbluray will start playback from "First-Title" title */ if (bd_play(p_sys->bluray) == 0) @@ -975,7 +971,6 @@ static void blurayOverlayProc(void *ptr, const BD_OVERLAY *const overlay) } } -#if BLURAY_VERSION >= BLURAY_VERSION_CODE(0,3,0) /* * ARGB overlay (BD-J) */ @@ -1056,7 +1051,6 @@ static void blurayArgbOverlayProc(void *ptr, const BD_ARGB_OVERLAY *const overla break; } } -#endif static void bluraySendOverlayToVout(demux_t *p_demux) { _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
