videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

Require libbluray 0.3.0

This commit is contained in:
Jean-Baptiste Kempf 2013-12-27 11:15:17 +01:00
parent 50229412d3
commit 647aa51434
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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

2
contrib/src/bluray/rules.mak
View File

@ -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

6
modules/access/bluray.c
View File

@ -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)
{