Skip to content

V
vlc-2-2
Commit 771b5e8c authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/mux/mpeg/ts.c: disabled some broken code.

parent 71a79544
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 7 deletions
modules/mux/mpeg/ts.c
View file @ 771b5e8c
...@@ -2120,8 +2120,7 @@ static uint32_t GetDescriptorLength24b( int i_length ) ...@@ -2120,8 +2120,7 @@ static uint32_t GetDescriptorLength24b( int i_length )
return( 0x808000 | ( i_l3 << 16 ) | ( i_l2 << 8 ) | i_l1 ); return( 0x808000 | ( i_l3 << 16 ) | ( i_l2 << 8 ) | i_l1 );
} }
static void GetPMT( sout_mux_t *p_mux, static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
sout_buffer_chain_t *c )
{ {
sout_mux_sys_t *p_sys = p_mux->p_sys; sout_mux_sys_t *p_sys = p_mux->p_sys;
block_t *p_pmt[MAX_PMT]; block_t *p_pmt[MAX_PMT];
...@@ -2325,8 +2324,8 @@ static void GetPMT( sout_mux_t *p_mux, ...@@ -2325,8 +2324,8 @@ static void GetPMT( sout_mux_t *p_mux,
GetDescriptorLength24b( bits.i_data - GetDescriptorLength24b( bits.i_data -
bits_fix_IOD.i_data - 3 ) ); bits_fix_IOD.i_data - 3 ) );
#ifdef HAVE_BSEARCH #if 0//def HAVE_BSEARCH /* FIXME!!! This can't possibly work */
i_pidinput = ((es_format_t *)(p_mux->pp_inputs[i]->p_fmt))->i_id; i_pidinput = p_mux->pp_inputs[i]->p_fmt->i_id;
p_usepid = bsearch( &i_pidinput, p_sys->pmtmap, p_sys->i_pmtslots, p_usepid = bsearch( &i_pidinput, p_sys->pmtmap, p_sys->i_pmtslots,
sizeof(pmt_map_t), intcompare ); sizeof(pmt_map_t), intcompare );
p_usepid = bsearch( &p_usepid, p_sys->pmtmap, p_sys->i_num_pmt, p_usepid = bsearch( &p_usepid, p_sys->pmtmap, p_sys->i_num_pmt,
...@@ -2347,12 +2346,13 @@ static void GetPMT( sout_mux_t *p_mux, ...@@ -2347,12 +2346,13 @@ static void GetPMT( sout_mux_t *p_mux,
{ {
ts_stream_t *p_stream; ts_stream_t *p_stream;
p_stream = (ts_stream_t*)p_mux->pp_inputs[i_stream]->p_sys; p_stream = (ts_stream_t *)p_mux->pp_inputs[i_stream]->p_sys;
i_pidinput = ((es_format_t *)(p_mux->pp_inputs[i_stream]->p_fmt))->i_id;
#ifdef HAVE_BSEARCH
i_pidinput = p_mux->pp_inputs[i_stream]->p_fmt->i_id;
p_usepid = bsearch( &i_pidinput, p_sys->pmtmap, p_sys->i_pmtslots, p_usepid = bsearch( &i_pidinput, p_sys->pmtmap, p_sys->i_pmtslots,
sizeof(pmt_map_t), intcompare ); sizeof(pmt_map_t), intcompare );
#ifdef HAVE_BSEARCH
if( p_usepid != NULL ) if( p_usepid != NULL )
p_es = dvbpsi_PMTAddES( p_es = dvbpsi_PMTAddES(
&p_sys->dvbpmt[((pmt_map_t *)p_usepid)->i_prog], &p_sys->dvbpmt[((pmt_map_t *)p_usepid)->i_prog],
......
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