[vlc-commits] demux: ps: rename Demux2 to what it really does

Francois Cartegnie git at videolan.org
Thu Mar 9 16:31:50 CET 2017


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Mar  9 11:21:53 2017 +0100| [ff04ff858af6e9e91fbfe7acf48b7e8be221997a] | committer: Francois Cartegnie

demux: ps: rename Demux2 to what it really does

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

 modules/demux/mpeg/ps.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/demux/mpeg/ps.c b/modules/demux/mpeg/ps.c
index e363d1a..d60edfe 100644
--- a/modules/demux/mpeg/ps.c
+++ b/modules/demux/mpeg/ps.c
@@ -225,7 +225,7 @@ static void Close( vlc_object_t *p_this )
     free( p_sys );
 }
 
-static int Demux2( demux_t *p_demux, bool b_end )
+static int Probe( demux_t *p_demux, bool b_end )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
     int i_ret, i_id;
@@ -292,7 +292,7 @@ static bool FindLength( demux_t *p_demux )
         /* Check beginning */
         int i = 0;
         i_current_pos = vlc_stream_Tell( p_demux->s );
-        while( i < 40 && Demux2( p_demux, false ) > 0 ) i++;
+        while( i < 40 && Probe( p_demux, false ) > 0 ) i++;
 
         /* Check end */
         i_size = stream_Size( p_demux->s );
@@ -300,7 +300,7 @@ static bool FindLength( demux_t *p_demux )
         if( vlc_stream_Seek( p_demux->s, i_size - i_end ) == VLC_SUCCESS )
         {
             i = 0;
-            while( i < 400 && Demux2( p_demux, true ) > 0 ) i++;
+            while( i < 400 && Probe( p_demux, true ) > 0 ) i++;
             if( i_current_pos >= 0 &&
                 vlc_stream_Seek( p_demux->s, i_current_pos ) != VLC_SUCCESS )
                     return false;



More information about the vlc-commits mailing list