basic instructions for maven2

[vlc] / modules / gui / fbosd.c

diff --git a/modules/gui/fbosd.c b/modules/gui/fbosd.c
index c1a7008fa53111bb1ddfeea1898d71541e30f3c8..c6d4b6302ba59ec707f1d54410bc90a81112cd1c 100644 (file)
--- a/modules/gui/fbosd.c
+++ b/modules/gui/fbosd.c
@@ -2,7 +2,7 @@
  * fbosd.c : framebuffer osd plugin for vlc
  *****************************************************************************
  * Copyright (C) 2007, the VideoLAN team
- * $Id: vlc-fb-overlay.patch,v 1.8 2007/10/19 14:33:23 jeanpaul.saman Exp $
+ * $Id$
  *
  * Authors: Jean-Paul Saman
  * Copied from modules/video_output/fb.c by Samuel Hocevar <sam@zoy.org>
@@ -546,7 +546,7 @@ static void CloseBlending( intf_thread_t *p_intf )
                            p_intf->p_sys->p_blend->p_module );
 
         vlc_object_detach( p_intf->p_sys->p_blend );
-        vlc_object_destroy( p_intf->p_sys->p_blend );
+        vlc_object_release( p_intf->p_sys->p_blend );
     }
 }
 #endif
@@ -580,7 +580,7 @@ static int OpenTextRenderer( intf_thread_t *p_intf )
         p_intf->p_sys->p_text->p_module =
             module_Need( p_intf->p_sys->p_text, "text renderer", 0, 0 );
     }
-    if( psz_modulename ) free( psz_modulename );
+    free( psz_modulename );
 
     if( !p_intf->p_sys->p_text->p_module )
         return VLC_EGENERIC;
@@ -597,7 +597,7 @@ static void CloseTextRenderer( intf_thread_t *p_intf )
                            p_intf->p_sys->p_text->p_module );
 
         vlc_object_detach( p_intf->p_sys->p_text );
-        vlc_object_destroy( p_intf->p_sys->p_text );
+        vlc_object_release( p_intf->p_sys->p_text );
     }
 }
 #if 0
@@ -636,7 +636,7 @@ static int CloseScaling( intf_thread_t *p_intf )
                            p_intf->p_sys->p_scale->p_module );
 
         vlc_object_detach( p_intf->p_sys->p_scale );
-        vlc_object_destroy( p_intf->p_sys->p_scale );
+        vlc_object_release( p_intf->p_sys->p_scale );
     }
 }
 #endif
@@ -684,9 +684,12 @@ static picture_t *AllocatePicture( vlc_object_t *p_this,
 static void DeAllocatePicture( vlc_object_t *p_this, picture_t *p_pic,
                                video_format_t *p_fmt )
 {
-    if( p_pic && p_pic->p_data_orig ) free( p_pic->p_data_orig );
-    if( p_pic && p_pic->pf_release ) p_pic->pf_release( p_pic );
-    if( p_fmt && p_fmt->p_palette )
+    if( p_pic )
+    {
+        free( p_pic->p_data_orig );
+        if( p_pic->pf_release ) p_pic->pf_release( p_pic );
+    }
+    if( p_fmt )
     {
         free( p_fmt->p_palette );
         p_fmt->p_palette = NULL;