# include "config.h"
#endif
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
#include <vlc_demux.h>
#include "ps.h"
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( "demux2", 1 );
+ set_capability( "demux", 1 );
set_callbacks( OpenForce, Close );
add_shortcut( "ps" );
TIME_LONGTEXT, true );
add_submodule();
- set_description( _("MPEG-PS demuxer") );
- set_capability( "demux2", 8 );
+ set_description( N_("MPEG-PS demuxer") );
+ set_capability( "demux", 8 );
set_callbacks( Open, Close );
vlc_module_end();
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;
/* 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 );
}
{
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 );
}
}
}
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 );
}
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 )
{