[vlc-commits] mkv: eliminate dead code

Rémi Denis-Courmont git at videolan.org
Thu Feb 5 21:40:58 CET 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Feb  5 20:25:23 2015 +0200| [8b566f5e47d3c7587aa08adcf50542a97c6f52a1] | committer: Rémi Denis-Courmont

mkv: eliminate dead code

Video output are always "alive", the predicate is always false.

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

 modules/demux/mkv/demux.cpp |   10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/modules/demux/mkv/demux.cpp b/modules/demux/mkv/demux.cpp
index 29f9c4b..1feca55 100644
--- a/modules/demux/mkv/demux.cpp
+++ b/modules/demux/mkv/demux.cpp
@@ -398,15 +398,7 @@ void event_thread_t::EventThread()
         vlc_mutex_unlock( &lock );
 
         /* Always check vout */
-        if( p_vout && !vlc_object_alive (p_vout) )
-        {
-            var_DelCallback( p_vout, "mouse-moved", EventMouse, this );
-            var_DelCallback( p_vout, "mouse-clicked", EventMouse, this );
-            vlc_object_release( p_vout );
-            p_vout = NULL;
-        }
-
-        else if( p_vout == NULL )
+        if( p_vout == NULL )
         {
             p_vout = (vlc_object_t*) input_GetVout(p_sys->p_input);
             if( p_vout)



More information about the vlc-commits mailing list