Move last.fm password from PasswordShowOnEdit to Password.

[vlc] / modules / demux / ts.c

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index e70d26105b9dea89ccea3907f6741609136c963f..f491ca59350529c84aaf6b8d2d74bae5d9f1a6cb 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -105,7 +105,7 @@ static void Close ( vlc_object_t * );
  *      where pid_description could take 3 forms:
  *          1. pid:pcr (to force the pcr pid)
  *          2. pid:stream_type
- *          3. pid:type:fourcc where type=(video|audio|spu)
+ *          3. pid:type=fourcc where type=(video|audio|spu)
  */
 #define PMT_TEXT N_("Extra PMT")
 #define PMT_LONGTEXT N_( \
@@ -941,13 +941,13 @@ static int DemuxFile( demux_t *p_demux )
         if( p_sys->buffer[i_pos] != 0x47 )
         {
             msg_Warn( p_demux, "lost sync" );
-            while( !p_demux->b_die && (i_pos < i_data) )
+            while( vlc_object_alive (p_demux) && (i_pos < i_data) )
             {
                 i_pos++;
                 if( p_sys->buffer[i_pos] == 0x47 )
                     break;
             }
-            if( !p_demux->b_die )
+            if( vlc_object_alive (p_demux) )
                 msg_Warn( p_demux, "sync found" );
         }
 
@@ -1052,7 +1052,7 @@ static int Demux( demux_t *p_demux )
             msg_Warn( p_demux, "lost synchro" );
             block_Release( p_pkt );
 
-            while( !p_demux->b_die )
+            while( vlc_object_alive (p_demux) )
             {
                 const uint8_t *p_peek;
                 int i_peek, i_skip = 0;