live555: remove the liveversion checks, now that we have a required version in config...

[vlc] / modules / demux / ps.c

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index 956fc0824eb6a84596cab8ad5f6c0df386bd0908..bed63fea63ca9d20a766d6581bcb0ee1d658ce9c 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -29,7 +29,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_demux.h>
 
@@ -124,6 +124,7 @@ static int OpenCommon( vlc_object_t *p_this, bool b_force )
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;
     p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+    if( !p_sys ) return VLC_ENOMEM;
 
     /* Init p_sys */
     p_sys->i_mux_rate = 0;
@@ -242,14 +243,14 @@ static void FindLength( demux_t *p_demux )
         /* Check beginning */
         i = 0;
         i_current_pos = stream_Tell( p_demux->s );
-        while( !p_demux->b_die && i < 40 && Demux2( p_demux, false ) > 0 ) i++;
+        while( vlc_object_alive (p_demux) && i < 40 && Demux2( p_demux, false ) > 0 ) i++;
 
         /* Check end */
         i_size = stream_Size( p_demux->s );
         i_end = __MAX( 0, __MIN( 200000, i_size ) );
         stream_Seek( p_demux->s, i_size - i_end );
 
-        while( !p_demux->b_die && Demux2( p_demux, true ) > 0 );
+        while( vlc_object_alive (p_demux) && Demux2( p_demux, true ) > 0 );
         if( i_current_pos >= 0 ) stream_Seek( p_demux->s, i_current_pos );
     }
 
@@ -388,7 +389,9 @@ static int Demux( demux_t *p_demux )
 #endif
                 !ps_pkt_parse_pes( p_pkt, tk->i_skip ) ) )
             {
-                if( !b_new && !p_sys->b_have_pack && tk->fmt.i_cat == AUDIO_ES && p_pkt->i_pts > 0 )
+                if( !b_new && !p_sys->b_have_pack &&
+                    (tk->fmt.i_cat == AUDIO_ES) &&
+                    (p_pkt->i_pts > 0) )
                 {
                     /* A hack to sync the A/V on PES files. */
                     msg_Dbg( p_demux, "force SCR: %"PRId64, p_pkt->i_pts );
@@ -557,6 +560,7 @@ static block_t *ps_pkt_read( stream_t *s, uint32_t i_code )
     const uint8_t *p_peek;
     int      i_peek = stream_Peek( s, &p_peek, 14 );
     int      i_size = ps_pkt_size( p_peek, i_peek );
+    VLC_UNUSED(i_code);
 
     if( i_size <= 6 && p_peek[3] > 0xba )
     {