[vlc-devel] commit: Removed unused picture_heap_t field in picture_t. (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Mon May 18 12:41:42 2009 +0200| [301a36b2d6e5f10d1cf1c3aa02391ccd4e3bae7d] | committer: Laurent Aimar 

Removed unused picture_heap_t field in picture_t.

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

 include/vlc_picture.h            |    3 ---
 src/video_output/video_output.c  |   11 -----------
 src/video_output/vout_pictures.c |    2 --
 3 files changed, 0 insertions(+), 16 deletions(-)

diff --git a/include/vlc_picture.h b/include/vlc_picture.h
index 696bc7c..26f6154 100644
--- a/include/vlc_picture.h
+++ b/include/vlc_picture.h
@@ -103,9 +103,6 @@ struct picture_t
     int             i_qtype;                       /**< quantification style */
     /**@}*/
 
-    /** The picture heap we are attached to */
-    picture_heap_t* p_heap;
-
     /* Some vouts require the picture to be locked before it can be modified */
     int (* pf_lock) ( vout_thread_t *, picture_t * );
     int (* pf_unlock) ( vout_thread_t *, picture_t * );
diff --git a/src/video_output/video_output.c b/src/video_output/video_output.c
index a2110d5..f01fd26 100644
--- a/src/video_output/video_output.c
+++ b/src/video_output/video_output.c
@@ -983,17 +983,6 @@ static int InitThread( vout_thread_t *p_vout )
         }
     }
 
-    /* Link pictures back to their heap */
-    for( i = 0 ; i < I_RENDERPICTURES ; i++ )
-    {
-        PP_RENDERPICTURE[ i ]->p_heap = &p_vout->render;
-    }
-
-    for( i = 0 ; i < I_OUTPUTPICTURES ; i++ )
-    {
-        PP_OUTPUTPICTURE[ i ]->p_heap = &p_vout->output;
-    }
-
     return VLC_SUCCESS;
 }
 
diff --git a/src/video_output/vout_pictures.c b/src/video_output/vout_pictures.c
index 791c49a..bc9a8fb 100644
--- a/src/video_output/vout_pictures.c
+++ b/src/video_output/vout_pictures.c
@@ -408,8 +408,6 @@ picture_t *vout_RenderPicture( vout_thread_t *p_vout, picture_t *p_pic,
                                   p_vout->fmt_out.i_aspect );
             p_tmp_pic->i_type = MEMORY_PICTURE;
             p_tmp_pic->i_status = RESERVED_PICTURE;
-            /* some modules (such as blend)  needs to know the extra information in picture heap */
-            p_tmp_pic->p_heap = &p_vout->output;
         }
 
         /* Convert image to the first direct buffer */