[vlc-devel] commit: Revert "Elide a bit of code that looks dead. There looks to be a memory leak, too." ( Rémi Denis-Courmont )

git version control git at videolan.org
Sat May 23 11:43:53 CEST 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 23 12:38:14 2009 +0300| [49d534e02090e16db037bf8f8209e15ba8a3ad13] | committer: Rémi Denis-Courmont 

Revert "Elide a bit of code that looks dead. There looks to be a memory leak, too."

This reverts commit 8018c67dc1970cf2536a3fd1f93e92c7a9dc9d07.

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

 modules/video_filter/alphamask.c |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/modules/video_filter/alphamask.c b/modules/video_filter/alphamask.c
index c65cb6b..b9ddcd9 100644
--- a/modules/video_filter/alphamask.c
+++ b/modules/video_filter/alphamask.c
@@ -87,7 +87,7 @@ static int Create( vlc_object_t *p_this )
 {
     filter_t *p_filter = (filter_t *)p_this;
     filter_sys_t *p_sys;
-    char *psz_string = NULL;
+    char *psz_string;
 
     if( p_filter->fmt_in.video.i_chroma != VLC_CODEC_YUVA )
     {
@@ -108,7 +108,6 @@ static int Create( vlc_object_t *p_this )
                        p_filter->p_cfg );
 
     p_sys->p_mask = NULL;
-#if 0 /* This appears to be dead code. Where is psz_string initialized? */
     if( psz_string && *psz_string )
     {
         LoadMask( p_filter, psz_string );
@@ -117,7 +116,6 @@ static int Create( vlc_object_t *p_this )
                      psz_string );
     }
     free( psz_string );
-#endif
 
     vlc_mutex_init( &p_sys->mask_lock );
     psz_string =




More information about the vlc-devel mailing list