Skip to content

V
vlc
Commit 3eb3a832 authored by Jean-Paul Saman's avatar Jean-Paul Saman Committed by Jean-Paul Saman
Browse files
Options

Compiler fix, dvbpsi_psi_section_t is the correct type.

parent 65146782
Show whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
modules/mux/mpeg/ts.c
View file @ 3eb3a832
...@@ -1379,13 +1379,16 @@ static int Mux( sout_mux_t *p_mux ) ...@@ -1379,13 +1379,16 @@ static int Mux( sout_mux_t *p_mux )
i_spu_delay = i_spu_delay =
p_spu->i_dts - p_pcr_stream->i_pes_dts; p_spu->i_dts - p_pcr_stream->i_pes_dts;
if( i_spu_delay > i_shaping_delay && if( ( i_spu_delay > i_shaping_delay ) &&
i_spu_delay < I64C(100000000) ) ( i_spu_delay < I64C(100000000) ) )
{
msg_Dbg( p_mux, "spu too early" );
continue; continue;
}
if ( i_spu_delay >= I64C(100000000) if( ( i_spu_delay >= I64C(100000000) ) ||
|| i_spu_delay < 10000 ) ( i_spu_delay < 10000 ) )
{ {
msg_Dbg( p_mux, "spu too late" );
BufferChainClean( p_mux->p_sout, BufferChainClean( p_mux->p_sout,
&p_stream->chain_pes ); &p_stream->chain_pes );
p_stream->i_pes_dts = 0; p_stream->i_pes_dts = 0;
...@@ -2234,7 +2237,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c ) ...@@ -2234,7 +2237,7 @@ static void GetPMT( sout_mux_t *p_mux, sout_buffer_chain_t *c )
block_t *p_sdt; block_t *p_sdt;
dvbpsi_sdt_t sdt; dvbpsi_sdt_t sdt;
dvbpsi_psi_section *p_section2; dvbpsi_psi_section_t *p_section2;
dvbpsi_sdt_service_t *p_service; dvbpsi_sdt_service_t *p_service;
char *psz_sdt_desc; char *psz_sdt_desc;
......
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