[vlc-commits] demux: nuv: use VLC_DEMUXER_

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jul 20 15:13:33 2016 +0200| [4d4a559d800420bbc9451c1582705b0958b8461a] | committer: Francois Cartegnie

demux: nuv: use VLC_DEMUXER_

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

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

diff --git a/modules/demux/nuv.c b/modules/demux/nuv.c
index 45fa407..23c53d8 100644
--- a/modules/demux/nuv.c
+++ b/modules/demux/nuv.c
@@ -368,7 +368,7 @@ static int Demux( demux_t *p_demux )
     for( ;; )
     {
         if( FrameHeaderLoad( p_demux, &fh ) )
-            return 0;
+            return VLC_DEMUXER_EOF;
 
         if( fh.i_type == 'A' || fh.i_type == 'V' )
             break;
@@ -378,13 +378,13 @@ static int Demux( demux_t *p_demux )
         if( fh.i_type != 'R' && fh.i_length > 0 )
         {
             if( stream_Read( p_demux->s, NULL, fh.i_length ) != fh.i_length )
-                return -1;
+                return VLC_DEMUXER_EGENERIC;
         }
     }
 
     /* */
     if( ( p_data = stream_Block( p_demux->s, fh.i_length ) ) == NULL )
-        return 0;
+        return VLC_DEMUXER_EOF;
 
     p_data->i_dts = VLC_TS_0 + (int64_t)fh.i_timecode * 1000;
     p_data->i_pts = (fh.i_type == 'V') ? VLC_TS_INVALID : p_data->i_dts;
@@ -436,7 +436,7 @@ static int Demux( demux_t *p_demux )
         block_Release( p_data );
     }
 
-    return 1;
+    return VLC_DEMUXER_SUCCESS;
 }
 
 /*****************************************************************************