[vlc-commits] bluray: fix setting parent input

Petri Hintukainen git at videolan.org
Thu Feb 13 12:59:20 CET 2014


vlc | branch: master | Petri Hintukainen <phintuka at users.sourceforge.net> | Wed Feb 12 22:37:50 2014 +0200| [332f4b09cbec96cf43dd4c681087336f33d2f727] | committer: Jean-Baptiste Kempf

bluray: fix setting parent input

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

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

 modules/access/bluray.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index d50bc68..c7e27b3 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -393,13 +393,13 @@ static int blurayOpen(vlc_object_t *object)
 
     /* Registering overlay event handler */
     bd_register_overlay_proc(p_sys->bluray, p_demux, blurayOverlayProc);
+    p_sys->p_input = demux_GetParentInput(p_demux);
+    if (unlikely(!p_sys->p_input)) {
+        msg_Err(p_demux, "Could not get parent input");
+        goto error;
+    }
 
     if (p_sys->b_menu) {
-        p_sys->p_input = demux_GetParentInput(p_demux);
-        if (unlikely(!p_sys->p_input)) {
-            msg_Err(p_demux, "Could not get parent input");
-            goto error;
-        }
 
         /* Register ARGB overlay handler for BD-J */
         if (disc_info->num_bdj_titles)



More information about the vlc-commits mailing list