Commit a996e2ca authored by Laurent Aimar's avatar Laurent Aimar

Flush audio/subtitle in next frame.

parent f144379a
...@@ -538,15 +538,21 @@ void input_DecoderFrameNext( decoder_t *p_dec, mtime_t *pi_duration ) ...@@ -538,15 +538,21 @@ void input_DecoderFrameNext( decoder_t *p_dec, mtime_t *pi_duration )
decoder_owner_sys_t *p_owner = p_dec->p_owner; decoder_owner_sys_t *p_owner = p_dec->p_owner;
*pi_duration = 0; *pi_duration = 0;
if( p_dec->fmt_in.i_cat != VIDEO_ES )
return;
vlc_mutex_lock( &p_owner->lock ); vlc_mutex_lock( &p_owner->lock );
if( p_owner->b_paused && p_owner->p_vout ) if( p_dec->fmt_in.i_cat == VIDEO_ES )
{ {
vout_NextPicture( p_owner->p_vout, pi_duration ); if( p_owner->b_paused && p_owner->p_vout )
p_owner->pause.i_ignore++; {
vlc_cond_signal( &p_owner->wait ); vout_NextPicture( p_owner->p_vout, pi_duration );
p_owner->pause.i_ignore++;
vlc_cond_signal( &p_owner->wait );
}
}
else
{
/* TODO subtitle should not be flushed */
DecoderFlush( p_dec );
} }
vlc_mutex_unlock( &p_owner->lock ); vlc_mutex_unlock( &p_owner->lock );
} }
......
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