Fix [79b485f92c454b7444ff5a2f2fd6e649aa7b8270] properly. Thanks for finding the dupli...

[vlc] / modules / demux / ts.c

diff --git a/modules/demux/ts.c b/modules/demux/ts.c
index 8e84154a9951516f9bf57465ba98a3677fd6f84a..68a61c5925add1d497d47ce6c1ba17c4403da161 100644 (file)
--- a/modules/demux/ts.c
+++ b/modules/demux/ts.c
@@ -31,6 +31,7 @@
 #endif
 
 #include <vlc/vlc.h>
+#include <vlc_plugin.h>
 
 #include <ctype.h>
 
@@ -39,7 +40,7 @@
 #include <vlc_meta.h>
 #include <vlc_epg.h>
 
-#include "iso_lang.h"
+#include <vlc_iso_lang.h>
 #include <vlc_network.h>
 #include <vlc_charset.h>
 
@@ -137,7 +138,7 @@ static void Close ( vlc_object_t * );
     "Specify the size of the buffer here and not the number of packets." )
 
 vlc_module_begin();
-    set_description( _("MPEG Transport Stream demuxer") );
+    set_description( N_("MPEG Transport Stream demuxer") );
     set_shortname ( "MPEG-TS" );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
@@ -1190,9 +1191,9 @@ static int DVBEventInformation( demux_t *p_demux, int64_t *pi_time, int64_t *pi_
         if( p_sys->i_dvb_start <= t && t < p_sys->i_dvb_start + p_sys->i_dvb_length )
         {
             if( pi_length )
-                *pi_length = p_sys->i_dvb_length * I64C(1000000);
+                *pi_length = p_sys->i_dvb_length * INT64_C(1000000);
             if( pi_time )
-                *pi_time   = (t - p_sys->i_dvb_start) * I64C(1000000);
+                *pi_time   = (t - p_sys->i_dvb_start) * INT64_C(1000000);
             return VLC_SUCCESS;
         }
     }
@@ -1255,7 +1256,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
             pi64 = (int64_t*)va_arg( args, int64_t * );
             if( p_sys->i_mux_rate > 0 )
             {
-                *pi64 = I64C(1000000) * ( stream_Size( p_demux->s ) / 50 ) /
+                *pi64 = INT64_C(1000000) * ( stream_Size( p_demux->s ) / 50 ) /
                         p_sys->i_mux_rate;
                 return VLC_SUCCESS;
             }
@@ -3236,7 +3237,8 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
                     pid->es->fmt.i_cat = SPU_ES;
                     pid->es->fmt.i_codec = VLC_FOURCC( 't', 'e', 'l', 'x' );
                     pid->es->fmt.i_extra = p_dr->i_length;
-                    pid->es->fmt.p_extra = malloc( p_dr->i_length );
+                    pid->es->fmt.p_extra = p_dr->i_length ?
+                        malloc( p_dr->i_length ) : NULL;
                     if( pid->es->fmt.p_extra )
                         memcpy( pid->es->fmt.p_extra, p_dr->p_data,
                                 p_dr->i_length );