Commit 17db527b authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* backport [17534] : Fix for audio and video crypt in MPEG-TS

parent 97d43e5e
...@@ -1586,7 +1586,6 @@ static int Mux( sout_mux_t *p_mux ) ...@@ -1586,7 +1586,6 @@ static int Mux( sout_mux_t *p_mux )
/* Select stream (lowest dts) */ /* Select stream (lowest dts) */
for( i = 0, i_stream = -1, i_dts = 0; i < p_mux->i_nb_inputs; i++ ) for( i = 0, i_stream = -1, i_dts = 0; i < p_mux->i_nb_inputs; i++ )
{ {
p_input = p_mux->pp_inputs[i];
p_stream = (ts_stream_t*)p_mux->pp_inputs[i]->p_sys; p_stream = (ts_stream_t*)p_mux->pp_inputs[i]->p_sys;
if( p_stream->i_pes_dts == 0 ) if( p_stream->i_pes_dts == 0 )
...@@ -1606,6 +1605,7 @@ static int Mux( sout_mux_t *p_mux ) ...@@ -1606,6 +1605,7 @@ static int Mux( sout_mux_t *p_mux )
break; break;
} }
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;
p_input = p_mux->pp_inputs[i_stream];
/* do we need to issue pcr */ /* do we need to issue pcr */
b_pcr = VLC_FALSE; b_pcr = 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