[vlc-devel] [PATCH] bluray: use VLC_DEMUXER_ defines for Demux() return values

Petri Hintukainen phintuka at gmail.com
Mon Oct 5 10:55:25 CEST 2015


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

diff --git a/modules/access/bluray.c b/modules/access/bluray.c
index 4155933..bbd6f88 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -1890,7 +1890,7 @@ static int blurayDemux(demux_t *p_demux)
 
     block_t *p_block = block_Alloc(NB_TS_PACKETS * (int64_t)BD_TS_PACKET_SIZE);
     if (!p_block)
-        return -1;
+        return VLC_DEMUXER_EGENERIC;
 
     int nread;
 
@@ -1914,8 +1914,8 @@ static int blurayDemux(demux_t *p_demux)
     if (nread <= 0) {
         block_Release(p_block);
         if (nread < 0)
-            return -1;
-        return 1;
+            return VLC_DEMUXER_EGENERIC;
+        return VLC_DEMUXER_SUCCESS;
     }
 
     p_block->i_buffer = nread;
@@ -1926,5 +1926,5 @@ static int blurayDemux(demux_t *p_demux)
 
     p_sys->b_flushed = false;
 
-    return 1;
+    return VLC_DEMUXER_SUCCESS;
 }
-- 
2.1.4



More information about the vlc-devel mailing list