[vlc-commits] demux: rawdv use VLC_DEMUXER_

Francois Cartegnie git at videolan.org
Thu May 3 13:59:33 CEST 2018


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu May  3 10:57:02 2018 +0200| [54f528c410f54ff152ae8d5e7c8ddb8d3285b2cf] | committer: Francois Cartegnie

demux: rawdv use VLC_DEMUXER_

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

 modules/demux/rawvid.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/modules/demux/rawvid.c b/modules/demux/rawvid.c
index 9cb45651c8..b773b9901d 100644
--- a/modules/demux/rawvid.c
+++ b/modules/demux/rawvid.c
@@ -402,13 +402,13 @@ static int Demux( demux_t *p_demux )
         /* Skip the frame header */
         /* Skip "FRAME" */
         if( vlc_stream_Read( p_demux->s, NULL, 5 ) < 5 )
-            return 0;
+            return VLC_DEMUXER_EOF;
         /* Find \n */
         for( ;; )
         {
             uint8_t b;
             if( vlc_stream_Read( p_demux->s, &b, 1 ) < 1 )
-                return 0;
+                return VLC_DEMUXER_EOF;
             if( b == 0x0a )
                 break;
         }
@@ -416,17 +416,14 @@ static int Demux( demux_t *p_demux )
 
     p_block = vlc_stream_Block( p_demux->s, p_sys->frame_size );
     if( p_block == NULL )
-    {
-        /* EOF */
-        return 0;
-    }
+        return VLC_DEMUXER_EOF;
 
     p_block->i_dts = p_block->i_pts = VLC_TS_0 + i_pcr;
     es_out_Send( p_demux->out, p_sys->p_es_video, p_block );
 
     date_Increment( &p_sys->pcr, 1 );
 
-    return 1;
+    return VLC_DEMUXER_SUCCESS;
 }
 
 /*****************************************************************************



More information about the vlc-commits mailing list