[vlc-commits] bluray: blurayInitTitles can not fail

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Mon Aug 12 09:17:50 2013 +0200| [6bfd731bf95211eec31c63ea57d2d78e25302701] | committer: Rafaël Carré

bluray: blurayInitTitles can not fail

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

 modules/access/bluray.c |    9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index d1edef9..c8d6971 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -156,7 +156,7 @@ static es_out_t *esOutNew( demux_t *p_demux );
 static int   blurayControl(demux_t *, int, va_list);
 static int   blurayDemux(demux_t *);
 
-static int   blurayInitTitles(demux_t *p_demux );
+static void  blurayInitTitles(demux_t *p_demux );
 static int   bluraySetTitle(demux_t *p_demux, int i_title);
 
 static void  blurayOverlayProc(void *ptr, const BD_OVERLAY * const overlay);
@@ -342,9 +342,7 @@ static int blurayOpen( vlc_object_t *object )
     if (!p_sys->p_meta)
         msg_Warn(p_demux, "Failed to get meta info." );
 
-    if (blurayInitTitles(p_demux) != VLC_SUCCESS) {
-        goto error;
-    }
+    blurayInitTitles(p_demux);
 
     /*
      * Initialize the event queue, so we can receive events in blurayDemux(Menu).
@@ -1030,7 +1028,7 @@ static void bluraySendOverlayToVout(demux_t *p_demux)
     p_sys->p_overlays[p_sys->current_overlay]->status = Outdated;
 }
 
-static int blurayInitTitles(demux_t *p_demux )
+static void blurayInitTitles(demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
 
@@ -1064,7 +1062,6 @@ static int blurayInitTitles(demux_t *p_demux )
         TAB_APPEND( p_sys->i_title, p_sys->pp_title, t );
         bd_free_title_info(title_info);
     }
-    return VLC_SUCCESS;
 }
 
 static void blurayResetParser( demux_t *p_demux )