[vlc-devel] commit: Remove useless NULL check (p_sys-> p_vout can never be NULL once the (Antoine Cellerier )

git version control git at videolan.org
Fri May 30 15:21:49 CEST 2008


vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Fri May 30 15:23:22 2008 +0200| [136eb9e288cc80ffc46b9d0d6a99966b3dbf1670]

Remove useless NULL check (p_sys->p_vout can never be NULL once the
filter was opened). (CID 110)

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

 modules/video_filter/logo.c |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/video_filter/logo.c b/modules/video_filter/logo.c
index aad0f1d..68c11be 100644
--- a/modules/video_filter/logo.c
+++ b/modules/video_filter/logo.c
@@ -489,12 +489,9 @@ static void End( vout_thread_t *p_vout )
     var_DelCallback( p_sys->p_vout, "mouse-x", MouseEvent, p_vout);
     var_DelCallback( p_sys->p_vout, "mouse-y", MouseEvent, p_vout);
 
-    if( p_sys->p_vout )
-    {
-        DEL_CALLBACKS( p_sys->p_vout, SendEvents );
-        vlc_object_detach( p_sys->p_vout );
-        vout_Destroy( p_sys->p_vout );
-    }
+    DEL_CALLBACKS( p_sys->p_vout, SendEvents );
+    vlc_object_detach( p_sys->p_vout );
+    vout_Destroy( p_sys->p_vout );
 
     if( p_sys->p_blend->p_module )
         module_Unneed( p_sys->p_blend, p_sys->p_blend->p_module );




More information about the vlc-devel mailing list