[vlc-commits] commit: Removed write only vout_thread_t::i_heap_size field. ( Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Apr 18 03:46:43 2010 +0200| [b189e402a1a3c1bd44ee8d022483d2332b8082e3] | committer: Laurent Aimar 

Removed write only vout_thread_t::i_heap_size field.

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

 include/vlc_vout.h               |    1 -
 src/video_output/video_output.c  |    3 ---
 src/video_output/vout_pictures.c |    3 ---
 3 files changed, 0 insertions(+), 7 deletions(-)

diff --git a/include/vlc_vout.h b/include/vlc_vout.h
index e51903e..9a9036a 100644
--- a/include/vlc_vout.h
+++ b/include/vlc_vout.h
@@ -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 */
 
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index a444862..d81e078 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -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;
 
diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 65fd7b7..be593f8 100644
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -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 );