Commit b2c33b64 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Require libbluray 0.5.0

parent a711c1ae
...@@ -1719,7 +1719,7 @@ PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 4.9.0], [DVD with navigation inpu ...@@ -1719,7 +1719,7 @@ PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 4.9.0], [DVD with navigation inpu
dnl dnl
dnl Blu-ray Disc Support with libbluray dnl Blu-ray Disc Support with libbluray
dnl dnl
PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.3.0], (libbluray for Blu-ray disc support ) ) PKG_ENABLE_MODULES_VLC([BLURAY], [libbluray], [libbluray >= 0.5.0], (libbluray for Blu-ray disc support ) )
dnl dnl
dnl OpenCV wrapper and example filters dnl OpenCV wrapper and example filters
......
...@@ -1164,18 +1164,13 @@ static void blurayUpdateTitleInfo(input_title_t *t, BLURAY_TITLE_INFO *title_inf ...@@ -1164,18 +1164,13 @@ static void blurayUpdateTitleInfo(input_title_t *t, BLURAY_TITLE_INFO *title_inf
static void blurayInitTitles(demux_t *p_demux, int menu_titles) static void blurayInitTitles(demux_t *p_demux, int menu_titles)
{ {
demux_sys_t *p_sys = p_demux->p_sys; demux_sys_t *p_sys = p_demux->p_sys;
#if BLURAY_VERSION < BLURAY_VERSION_CODE(0,5,0)
int64_t duration = 0;
#endif
/* get and set the titles */ /* get and set the titles */
unsigned i_title = menu_titles; unsigned i_title = menu_titles;
if (!p_sys->b_menu) { if (!p_sys->b_menu) {
i_title = bd_get_titles(p_sys->bluray, TITLES_RELEVANT, 60); i_title = bd_get_titles(p_sys->bluray, TITLES_RELEVANT, 60);
#if BLURAY_VERSION >= BLURAY_VERSION_CODE(0,5,0)
p_sys->i_longest_title = bd_get_main_title(p_sys->bluray); p_sys->i_longest_title = bd_get_main_title(p_sys->bluray);
#endif
} }
for (unsigned int i = 0; i < i_title; i++) { for (unsigned int i = 0; i < i_title; i++) {
...@@ -1188,12 +1183,6 @@ static void blurayInitTitles(demux_t *p_demux, int menu_titles) ...@@ -1188,12 +1183,6 @@ static void blurayInitTitles(demux_t *p_demux, int menu_titles)
blurayUpdateTitleInfo(t, title_info); blurayUpdateTitleInfo(t, title_info);
bd_free_title_info(title_info); bd_free_title_info(title_info);
#if BLURAY_VERSION < BLURAY_VERSION_CODE(0,5,0)
if (t->i_length > duration) {
duration = t->i_length;
p_sys->i_longest_title = i;
}
#endif
} else if (i == 0) { } else if (i == 0) {
t->psz_name = strdup(_("Top Menu")); t->psz_name = strdup(_("Top Menu"));
} else if (i == i_title - 1) { } else if (i == i_title - 1) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment