[vlc-commits] remoteosd: no need for vlc_object_kill()

Rémi Denis-Courmont git at videolan.org
Wed May 9 18:53:07 CEST 2012


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed May  9 17:58:20 2012 +0300| [15a725ad3ff10819623e1740a263587258934b77] | committer: Rémi Denis-Courmont

remoteosd: no need for vlc_object_kill()

vlc_cancel() terminates the thread. There is a massive leak though.

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

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

diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c
index a39f271..3835d2c 100644
--- a/modules/video_filter/remoteosd.c
+++ b/modules/video_filter/remoteosd.c
@@ -370,10 +370,6 @@ static void stop_osdvnc ( filter_t *p_filter )
 {
     filter_sys_t *p_sys = p_filter->p_sys;
 
-    /* It will unlock socket reading */
-    vlc_object_kill( p_filter );
-
-    /* */
     msg_Dbg( p_filter, "joining worker_thread" );
     vlc_cancel( p_sys->worker_thread );
     vlc_join( p_sys->worker_thread, NULL );



More information about the vlc-commits mailing list