|
|
|
@ -298,7 +298,6 @@ static input_thread_t *Create( vlc_object_t *p_parent, |
|
|
|
priv->b_thumbnailing = option == INPUT_CREATE_OPTION_THUMBNAILING; |
|
|
|
priv->b_can_pace_control = true; |
|
|
|
priv->i_start = 0; |
|
|
|
priv->i_time = VLC_TICK_INVALID; |
|
|
|
priv->i_stop = 0; |
|
|
|
priv->i_title_offset = input_priv(p_input)->i_seekpoint_offset = 0; |
|
|
|
priv->i_state = INIT_S; |
|
|
|
@ -526,10 +525,11 @@ static void MainLoopDemux( input_thread_t *p_input, bool *pb_changed ) |
|
|
|
|
|
|
|
if( p_priv->i_stop > 0 ) |
|
|
|
{ |
|
|
|
if( demux_Control( p_demux, DEMUX_GET_TIME, &p_priv->i_time ) ) |
|
|
|
p_priv->i_time = VLC_TICK_INVALID; |
|
|
|
vlc_tick_t i_time; |
|
|
|
if( demux_Control( p_demux, DEMUX_GET_TIME, &i_time ) ) |
|
|
|
i_time = VLC_TICK_INVALID; |
|
|
|
|
|
|
|
if( p_priv->i_stop <= p_priv->i_time ) |
|
|
|
if( p_priv->i_stop <= i_time ) |
|
|
|
i_ret = VLC_DEMUXER_EOF; |
|
|
|
} |
|
|
|
|
|
|
|
@ -621,7 +621,6 @@ static void MainLoopStatistics( input_thread_t *p_input ) |
|
|
|
|
|
|
|
if( demux_Control( priv->master->p_demux, DEMUX_GET_TIME, &i_time ) ) |
|
|
|
i_time = VLC_TICK_INVALID; |
|
|
|
input_priv(p_input)->i_time = i_time; |
|
|
|
|
|
|
|
if( demux_Control( priv->master->p_demux, DEMUX_GET_LENGTH, &i_length ) ) |
|
|
|
i_length = VLC_TICK_INVALID; |
|
|
|
|