Skip to content

V
vlc-2-2
Commit c63cc6b0 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Manual revert of now unneeded a1b58a77. 

Picture reserved/linked state has been merged.
parent 94e0618b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
src/input/decoder.c
View file @ c63cc6b0
...@@ -1342,7 +1342,6 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, ...@@ -1342,7 +1342,6 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
vout_ReleasePicture( p_vout, p_picture ); vout_ReleasePicture( p_vout, p_picture );
return; return;
} }
vout_HoldPicture( p_vout, p_picture );
/* */ /* */
vlc_mutex_lock( &p_owner->lock ); vlc_mutex_lock( &p_owner->lock );
...@@ -1422,7 +1421,6 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, ...@@ -1422,7 +1421,6 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
p_owner->i_last_rate = i_rate; p_owner->i_last_rate = i_rate;
} }
vout_PutPicture( p_vout, p_picture ); vout_PutPicture( p_vout, p_picture );
vout_ReleasePicture( p_vout, p_picture );
} }
else else
{ {
...@@ -1433,7 +1431,6 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture, ...@@ -1433,7 +1431,6 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
*pi_lost_sum += 1; *pi_lost_sum += 1;
vout_ReleasePicture( p_vout, p_picture ); vout_ReleasePicture( p_vout, p_picture );
vout_ReleasePicture( p_vout, p_picture );
} }
int i_tmp_display; int i_tmp_display;
int i_tmp_lost; int i_tmp_lost;
...@@ -1688,7 +1685,6 @@ static void DecoderFlushBuffering( decoder_t *p_dec ) ...@@ -1688,7 +1685,6 @@ static void DecoderFlushBuffering( decoder_t *p_dec )
if( p_owner->p_vout ) if( p_owner->p_vout )
{ {
vout_ReleasePicture( p_owner->p_vout, p_picture ); vout_ReleasePicture( p_owner->p_vout, p_picture );
vout_ReleasePicture( p_owner->p_vout, p_picture );
} }
if( !p_owner->buffer.p_picture ) if( !p_owner->buffer.p_picture )
......
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