Commit 652cd67e authored by Antoine Cellerier's avatar Antoine Cellerier

Revert "Allow use of inputs without DEMUX_GET/SET_*TIME in input-slave."

This reverts commit 60106b74.
That patch isn't a correct fix for the problem.
parent 5816553e
...@@ -2732,12 +2732,11 @@ static void SlaveDemux( input_thread_t *p_input ) ...@@ -2732,12 +2732,11 @@ static void SlaveDemux( input_thread_t *p_input )
{ {
int64_t i_time; int64_t i_time;
int i; int i;
bool b_set_time = true;
if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) ) if( demux_Control( p_input->p->input.p_demux, DEMUX_GET_TIME, &i_time ) )
{ {
/* msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" ); */ msg_Err( p_input, "demux doesn't like DEMUX_GET_TIME" );
b_set_time = false; return;
} }
for( i = 0; i < p_input->p->i_slave; i++ ) for( i = 0; i < p_input->p->i_slave; i++ )
...@@ -2748,7 +2747,7 @@ static void SlaveDemux( input_thread_t *p_input ) ...@@ -2748,7 +2747,7 @@ static void SlaveDemux( input_thread_t *p_input )
if( in->b_eof ) if( in->b_eof )
continue; continue;
if( b_set_time && demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) ) if( demux_Control( in->p_demux, DEMUX_SET_NEXT_DEMUX_TIME, i_time ) )
{ {
for( ;; ) for( ;; )
{ {
......
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