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

Petri Hintukainen git at videolan.org
Tue Oct 6 12:15:33 CEST 2015


vlc | branch: master | Petri Hintukainen <phintuka at gmail.com> | Mon Oct  5 11:55:25 2015 +0300| [1a26c53fcc761ad0c5c64edb130c5d14dae11f85] | committer: Jean-Baptiste Kempf

bluray: use VLC_DEMUXER_ defines for Demux() return values

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

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

 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 a183d01..cbb4734 100644
--- a/modules/access/bluray.c
+++ b/modules/access/bluray.c
@@ -1829,7 +1829,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;
 
@@ -1900,8 +1900,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;
@@ -1912,5 +1912,5 @@ static int blurayDemux(demux_t *p_demux)
 
     p_sys->b_flushed = false;
 
-    return 1;
+    return VLC_DEMUXER_SUCCESS;
 }



More information about the vlc-commits mailing list