[vlc-commits] Require libbluray 0.5.0

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jan 25 13:29:45 2015 +0100| [b2c33b64978fa42fc96409cccf61c5c903d5c40a] | committer: Jean-Baptiste Kempf

Require libbluray 0.5.0

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b2c33b64978fa42fc96409cccf61c5c903d5c40a
---

 configure.ac            |    2 +-
 modules/access/bluray.c |   11 -----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index d748f42..e5a22c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1719,7 +1719,7 @@ PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 4.9.0], [DVD with navigation inpu
 dnl
 dnl  Blu-ray Disc Support with libbluray
 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  OpenCV wrapper and example filters
diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 8540735..4a46407 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -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)
 {
     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 */
     unsigned i_title = menu_titles;
 
     if (!p_sys->b_menu) {
         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);
-#endif
     }
 
     for (unsigned int i = 0; i < i_title; i++) {
@@ -1188,12 +1183,6 @@ static void blurayInitTitles(demux_t *p_demux, int menu_titles)
             blurayUpdateTitleInfo(t, 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) {
             t->psz_name = strdup(_("Top Menu"));
         } else if (i == i_title - 1) {