[vlc-commits] x264: fix memory leak

Hannes Domani git at videolan.org
Sun Feb 15 22:40:09 CET 2015


vlc/vlc-2.2 | branch: master | Hannes Domani <ssbssa at yahoo.de> | Sun Feb 15 19:18:08 2015 +0100| [9c8721d89f8c4a36f1a0504928ab5cd09fb52772] | committer: Rémi Denis-Courmont

x264: fix memory leak

Signed-off-by: Rémi Denis-Courmont <remi at remlab.net>
(cherry picked from commit c3a908c4d1cedbb7d6b2efbe037380dc80528267)

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

 modules/codec/x264.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/x264.c b/modules/codec/x264.c
index b7778c1..be5d000 100644
--- a/modules/codec/x264.c
+++ b/modules/codec/x264.c
@@ -1150,8 +1150,8 @@ static int  Open ( vlc_object_t *p_this )
        {
            p_sys->param.analyse.i_me_method = X264_ME_TESA;
        }
-       free( psz_val );
     }
+    free( psz_val );
 
     i_val = var_GetInteger( p_enc, SOUT_CFG_PREFIX "merange" );
     if( i_val >= 0 && i_val <= 64 && i_val != 16 )



More information about the vlc-commits mailing list