Skip to content

V
vlc-1.1
Commit 53b1aaf7 authored by Christophe Massiot's avatar Christophe Massiot
Browse files
Options

* modules/demux/ts.c: Fixed --ts-out used in conjunction with the dvb access.

parent 5d3d5ee7
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
modules/demux/ts.c
View file @ 53b1aaf7
...@@ -3277,7 +3277,8 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt ) ...@@ -3277,7 +3277,8 @@ static void PMTCallBack( demux_t *p_demux, dvbpsi_pmt_t *p_pmt )
} }
} }
if( DVBProgramIsSelected( p_demux, prg->i_number ) ) if( DVBProgramIsSelected( p_demux, prg->i_number )
&& (pid->es->id != NULL || p_sys->b_udp_out) )
{ {
/* Set demux filter */ /* Set demux filter */
stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
...@@ -3474,7 +3475,9 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat ) ...@@ -3474,7 +3475,9 @@ static void PATCallBack( demux_t *p_demux, dvbpsi_pat_t *p_pat )
if( p_sys->i_dvb_program == 0 ) if( p_sys->i_dvb_program == 0 )
p_sys->i_dvb_program = p_program->i_number; p_sys->i_dvb_program = p_program->i_number;
if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS, ACCESS_SET_PRIVATE_ID_STATE, p_program->i_pid, VLC_TRUE ) ) if( stream_Control( p_demux->s, STREAM_CONTROL_ACCESS,
ACCESS_SET_PRIVATE_ID_STATE,
p_program->i_pid, VLC_TRUE ) )
p_sys->b_dvb_control = VLC_FALSE; p_sys->b_dvb_control = VLC_FALSE;
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment