demux/playlist: Don't use playlist_t.

[vlc] / modules / demux / ps.c

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index ffb27066610d8cc05eef0e1b5c4c7fc865303376..f7ffc3e8251732962e7f5e0fce5363b418f2d611 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -29,7 +29,8 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_demux.h>
 
 #include "ps.h"
@@ -52,7 +53,7 @@ static int  Open   ( vlc_object_t * );
 static void Close  ( vlc_object_t * );
 
 vlc_module_begin();
-    set_description( _("MPEG-PS demuxer") );
+    set_description( N_("MPEG-PS demuxer") );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     set_capability( "demux", 1 );
@@ -63,7 +64,7 @@ vlc_module_begin();
                  TIME_LONGTEXT, true );
 
     add_submodule();
-    set_description( _("MPEG-PS demuxer") );
+    set_description( N_("MPEG-PS demuxer") );
     set_capability( "demux", 8 );
     set_callbacks( Open, Close );
 vlc_module_end();
@@ -263,7 +264,7 @@ static void FindLength( demux_t *p_demux )
                 {
                     p_sys->i_length = i_length;
                     p_sys->i_time_track = i;
-                    msg_Dbg( p_demux, "we found a length of: "I64Fd, p_sys->i_length );
+                    msg_Dbg( p_demux, "we found a length of: %"PRId64, p_sys->i_length );
                 }
             }
     }
@@ -381,12 +382,18 @@ static int Demux( demux_t *p_demux )
             p_sys->i_scr = -1;
 
             if( tk->b_seen && tk->es &&
-                !ps_pkt_parse_pes( p_pkt, tk->i_skip ) )
+                (
+#ifdef ZVBI_COMPILED /* FIXME!! */
+                tk->fmt.i_codec == VLC_FOURCC('t','e','l','x') ||
+#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: "I64Fd, p_pkt->i_pts );
+                    msg_Dbg( p_demux, "force SCR: %"PRId64, p_pkt->i_pts );
                     es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_pkt->i_pts );
                 }