[vlc-devel] commit: Revert "Fixed image_Convert by properly overriding release policy." (Laurent Aimar )

[git version control]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Thu Jul 17 22:44:07 2008 +0200| [9e81bb494b4e8778be0a8993afa10915ce70242f]

Revert "Fixed image_Convert by properly overriding release policy."
A simpler way is comming.
This reverts commit 796e72022f71598de3a162998a240632e65fed60.

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

 src/misc/image.c |   15 +--------------
 1 files changed, 1 insertions(+), 14 deletions(-)

diff --git a/src/misc/image.c b/src/misc/image.c
index 09c399f..4fc679a 100644
--- a/src/misc/image.c
+++ b/src/misc/image.c
@@ -70,9 +70,6 @@ static filter_t *CreateFilter( vlc_object_t *, es_format_t *,
 static void DeleteFilter( filter_t * );
 
 static vlc_fourcc_t Ext2Fourcc( const char * );
-
-static void video_release_buffer_dummy( picture_t *p_pic );
-
 /*static const char *Fourcc2Ext( vlc_fourcc_t );*/
 
 /**
@@ -448,14 +445,8 @@ static picture_t *ImageConvert( image_handler_t *p_image, picture_t *p_pic,
         p_image->p_filter->fmt_out.video = *p_fmt_out;
     }
 
-    /* We have to override the current release scheme for p_pic.
-     * (You cannot suppose what pf_release will do or even if it
-     * is defined) */
-    void (*pf_sav_release)( picture_t * ) = p_pic->pf_release;
-
-    p_pic->pf_release = video_release_buffer_dummy;
+    p_pic->i_refcount++; /* pf_video_filter() will call pf_release() */
     p_pif = p_image->p_filter->pf_video_filter( p_image->p_filter, p_pic );
-    p_pic->pf_release = pf_sav_release;
 
     if( p_fmt_in->i_chroma == p_fmt_out->i_chroma &&
         p_fmt_in->i_width == p_fmt_out->i_width &&
@@ -572,10 +563,6 @@ static const char *Fourcc2Ext( vlc_fourcc_t i_codec )
 }
 */
 
-static void video_release_buffer_dummy( picture_t *p_pic )
-{
-    VLC_UNUSED( p_pic );
-}
 static void video_release_buffer( picture_t *p_pic )
 {
     if( --p_pic->i_refcount > 0 ) return;