]> git.sesse.net Git - vlc/commitdiff
Removed write only vout_thread_t::i_heap_size field.
authorLaurent Aimar <fenrir@videolan.org>
Sun, 18 Apr 2010 01:46:43 +0000 (03:46 +0200)
committerLaurent Aimar <fenrir@videolan.org>
Sun, 18 Apr 2010 12:58:37 +0000 (14:58 +0200)
include/vlc_vout.h
src/video_output/video_output.c
src/video_output/vout_pictures.c

index e51903e277925b1226c1475290ba96836dadb635..9a9036a447aeb061ce5d9c5e6aed2a66e566afe3 100644 (file)
@@ -114,7 +114,6 @@ struct vout_thread_t
 
     /** \name Video heap and translation tables */
     /**@{*/
-    int                 i_heap_size;                          /**< heap size */
     picture_heap_t      render;                       /**< rendered pictures */
     picture_heap_t      output;                          /**< direct buffers */
 
index a44486242225576f5cacdaa59d8beb9a9f7907b8..d81e0784d7deb7517637692722b137bfb6240ccb 100644 (file)
@@ -335,9 +335,6 @@ vout_thread_t * vout_Create( vlc_object_t *p_parent, video_format_t *p_fmt )
         p_vout->p_picture[i_index].b_slow   = 0;
     }
 
-    /* No images in the heap */
-    p_vout->i_heap_size = 0;
-
     /* Initialize the rendering heap */
     I_RENDERPICTURES = 0;
 
index 65fd7b7cd99f46ba5e0f2da54e7bad7561d3c9a5..be593f88bdf0ce89e32922a231383e27ddd8e27d 100644 (file)
@@ -142,7 +142,6 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout,
                 p_pic->i_nb_fields          = i_nb_fields;
                 p_pic->b_top_field_first    = b_top_field_first;
 
-                p_vout->i_heap_size++;
                 p_vout->render.i_last_used_pic =
                     ( p_vout->render.i_last_used_pic + i_pic + 1 )
                     % I_RENDERPICTURES;
@@ -187,7 +186,6 @@ picture_t *vout_CreatePicture( vout_thread_t *p_vout,
             p_freepic->i_nb_fields          = i_nb_fields;
             p_freepic->b_top_field_first    = b_top_field_first;
 
-            p_vout->i_heap_size++;
         }
         else
         {
@@ -216,7 +214,6 @@ static void DestroyPicture( vout_thread_t *p_vout, picture_t *p_picture )
     vlc_assert_locked( &p_vout->picture_lock );
 
     p_picture->i_status = DESTROYED_PICTURE;
-    p_vout->i_heap_size--;
     picture_CleanupQuant( p_picture );
 
     vlc_cond_signal( &p_vout->p->picture_wait );