Commit 68cb6a3a authored by Sam Hocevar's avatar Sam Hocevar

* "synch" -> "sync" (gniihiihiimineeeeerveuh)

parent 1a913c6a
...@@ -589,13 +589,13 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block ) ...@@ -589,13 +589,13 @@ static int DecoderDecode( decoder_t *p_dec, block_t *p_block )
if( p_dec->p_owner->p_sout->i_out_pace_nocontrol > 0 && if( p_dec->p_owner->p_sout->i_out_pace_nocontrol > 0 &&
p_dec->p_owner->p_input->b_out_pace_control ) p_dec->p_owner->p_input->b_out_pace_control )
{ {
msg_Dbg( p_dec, "switching to synch mode" ); msg_Dbg( p_dec, "switching to sync mode" );
p_dec->p_owner->p_input->b_out_pace_control = VLC_FALSE; p_dec->p_owner->p_input->b_out_pace_control = VLC_FALSE;
} }
else if( p_dec->p_owner->p_sout->i_out_pace_nocontrol <= 0 && else if( p_dec->p_owner->p_sout->i_out_pace_nocontrol <= 0 &&
!p_dec->p_owner->p_input->b_out_pace_control ) !p_dec->p_owner->p_input->b_out_pace_control )
{ {
msg_Dbg( p_dec, "switching to asynch mode" ); msg_Dbg( p_dec, "switching to async mode" );
p_dec->p_owner->p_input->b_out_pace_control = VLC_TRUE; p_dec->p_owner->p_input->b_out_pace_control = VLC_TRUE;
} }
} }
......
...@@ -1008,7 +1008,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick ) ...@@ -1008,7 +1008,7 @@ static int Init( input_thread_t * p_input, vlc_bool_t b_quick )
} }
msg_Dbg( p_input, "starting in %s mode", msg_Dbg( p_input, "starting in %s mode",
p_input->b_out_pace_control ? "asynch" : "synch" ); p_input->b_out_pace_control ? "async" : "sync" );
} }
} }
...@@ -1270,7 +1270,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, ...@@ -1270,7 +1270,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
} }
if( f_pos < 0.0 ) f_pos = 0.0; if( f_pos < 0.0 ) f_pos = 0.0;
if( f_pos > 1.0 ) f_pos = 1.0; if( f_pos > 1.0 ) f_pos = 1.0;
/* Reset the decoders states and clock synch (before calling the demuxer */ /* Reset the decoders states and clock sync (before calling the demuxer */
es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE );
if( demux2_Control( p_input->input.p_demux, DEMUX_SET_POSITION, if( demux2_Control( p_input->input.p_demux, DEMUX_SET_POSITION,
...@@ -1308,7 +1308,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type, ...@@ -1308,7 +1308,7 @@ static vlc_bool_t Control( input_thread_t *p_input, int i_type,
} }
if( i_time < 0 ) i_time = 0; if( i_time < 0 ) i_time = 0;
/* Reset the decoders states and clock synch (before calling the demuxer */ /* Reset the decoders states and clock sync (before calling the demuxer */
es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR ); es_out_Control( p_input->p_es_out, ES_OUT_RESET_PCR );
input_EsOutDiscontinuity( p_input->p_es_out, VLC_FALSE ); input_EsOutDiscontinuity( p_input->p_es_out, 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