Make sure INT64_C is defined correctly, and that we don't conflict with config.h.

[vlc] / modules / demux / ps.c

diff --git a/modules/demux/ps.c b/modules/demux/ps.c
index 0b213d0ace38ae984ec33ae9ea05455858b70bbd..956fc0824eb6a84596cab8ad5f6c0df386bd0908 100644 (file)
--- a/modules/demux/ps.c
+++ b/modules/demux/ps.c
@@ -30,6 +30,7 @@
 #endif
 
 #include <vlc/vlc.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();
@@ -381,7 +382,11 @@ 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 )
                 {