Commit d19d234b authored by Steve Lhomme's avatar Steve Lhomme

decoder: remove always true boolean

The VLC_TICK_INVALID check is done early. After that we don't need to check it
anymore.
parent 79ab3ac4
......@@ -1025,8 +1025,6 @@ static int DecoderPlayVideo( struct decoder_owner *p_owner, picture_t *p_picture
p_picture->b_force = true;
}
const bool b_dated = p_picture->date != VLC_TICK_INVALID;
vlc_mutex_unlock( &p_owner->lock );
/* FIXME: The *input* FIFO should not be locked here. This will not work
......@@ -1040,24 +1038,12 @@ static int DecoderPlayVideo( struct decoder_owner *p_owner, picture_t *p_picture
if( p_vout == NULL )
goto discard;
if( p_picture->b_force || p_picture->date != VLC_TICK_INVALID )
/* FIXME: VLC_TICK_INVALID -- verify video_output */
if( p_picture->b_still )
{
if( p_picture->b_still )
{
/* Ensure no earlier higher pts breaks still state */
vout_Flush( p_vout, p_picture->date );
}
vout_PutPicture( p_vout, p_picture );
}
else
{
if( b_dated )
msg_Warn( p_dec, "early picture skipped" );
else
msg_Warn( p_dec, "non-dated video buffer received" );
goto discard;
/* Ensure no earlier higher pts breaks still state */
vout_Flush( p_vout, p_picture->date );
}
vout_PutPicture( p_vout, p_picture );
return VLC_SUCCESS;
discard:
......
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