[vlc-commits] commit: Manual revert of now unneeded a1b58a771b1bdfcca56d24541b43ce5bf6caf8b7. ( Laurent Aimar )

git at videolan.org git at videolan.org
Sat Apr 24 00:01:50 CEST 2010


vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sat Apr 24 00:00:19 2010 +0200| [c63cc6b04c979c6eadfad6fef740ea4cac89110a] | committer: Laurent Aimar 

Manual revert of now unneeded a1b58a771b1bdfcca56d24541b43ce5bf6caf8b7.

Picture reserved/linked state has been merged.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=c63cc6b04c979c6eadfad6fef740ea4cac89110a
---

 src/input/decoder.c |    4 ----
 1 files changed, 0 insertions(+), 4 deletions(-)

diff --git a/src/input/decoder.c b/src/input/decoder.c
index 3f36282..671cff7 100644
--- a/src/input/decoder.c
+++ b/src/input/decoder.c
@@ -1342,7 +1342,6 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
         vout_ReleasePicture( p_vout, p_picture );
         return;
     }
-    vout_HoldPicture( p_vout, p_picture );
 
     /* */
     vlc_mutex_lock( &p_owner->lock );
@@ -1422,7 +1421,6 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
                 p_owner->i_last_rate = i_rate;
             }
             vout_PutPicture( p_vout, p_picture );
-            vout_ReleasePicture( p_vout, p_picture );
         }
         else
         {
@@ -1433,7 +1431,6 @@ static void DecoderPlayVideo( decoder_t *p_dec, picture_t *p_picture,
 
             *pi_lost_sum += 1;
             vout_ReleasePicture( p_vout, p_picture );
-            vout_ReleasePicture( p_vout, p_picture );
         }
         int i_tmp_display;
         int i_tmp_lost;
@@ -1688,7 +1685,6 @@ static void DecoderFlushBuffering( decoder_t *p_dec )
         if( p_owner->p_vout )
         {
             vout_ReleasePicture( p_owner->p_vout, p_picture );
-            vout_ReleasePicture( p_owner->p_vout, p_picture );
         }
 
         if( !p_owner->buffer.p_picture )



More information about the vlc-commits mailing list