[vlc-commits] bluray: Fetching meta info isn't mandatory.

[Hugo Beauzée-Luyssen]

vlc/vlc-2.0 | branch: master | Hugo Beauzée-Luyssen <beauze.h at gmail.com> | Sun Mar 11 15:50:49 2012 +0100| [26f630e110a4f8e4d75f3dabdf5e874c90e9b16d] | committer: Jean-Baptiste Kempf

bluray: Fetching meta info isn't mandatory.

This should fix bluray playback on windows.
(cherry picked from commit 12bb4f9d52832dafb493d0c0241b154cbdce251e)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/access/bluray.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 6505695..833ccf0 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -248,7 +248,7 @@ static int blurayOpen( vlc_object_t *object )
     /* Get titles and chapters */
     p_sys->p_meta = bd_get_meta(p_sys->bluray);
     if (!p_sys->p_meta)
-        goto error;
+        msg_Warn(p_demux, "Failed to get meta info." );
 
     if (blurayInitTitles(p_demux) != VLC_SUCCESS) {
         goto error;
@@ -912,6 +912,8 @@ static int blurayControl(demux_t *p_demux, int query, va_list args)
         {
             vlc_meta_t *p_meta = (vlc_meta_t *) va_arg (args, vlc_meta_t*);
             const META_DL *meta = p_sys->p_meta;
+            if (meta == NULL)
+                return VLC_EGENERIC;
 
             if (!EMPTY_STR(meta->di_name)) vlc_meta_SetTitle(p_meta, meta->di_name);