Fix description

[vlc] / modules / video_filter / remoteosd.c

diff --git a/modules/video_filter/remoteosd.c b/modules/video_filter/remoteosd.c
old mode 100755 (executable)
new mode 100644 (file)
index 239d3b7..b7fbc78
--- a/modules/video_filter/remoteosd.c
+++ b/modules/video_filter/remoteosd.c
@@ -260,10 +260,7 @@ static int CreateFilter ( vlc_object_t *p_this )
 
     p_filter->p_sys = p_sys = (filter_sys_t *) malloc( sizeof(filter_sys_t) );
     if( !p_filter->p_sys )
-    {
-        msg_Err( p_filter, "out of memory" );
         return VLC_ENOMEM;
-    }
     memset( p_sys, 0, sizeof(filter_sys_t) );
 
     /* Populating struct */
@@ -333,8 +330,11 @@ static int CreateFilter ( vlc_object_t *p_this )
     es_format_Init( &p_filter->fmt_out, SPU_ES, VLC_FOURCC( 's','p','u',' ' ) );
     p_filter->fmt_out.i_priority = 0;
 
+    vlc_gcrypt_init();
+
     /* create the vnc worker thread */
-    p_sys->p_worker_thread = vlc_object_create( p_this, VLC_OBJECT_GENERIC );
+    p_sys->p_worker_thread = vlc_object_create( p_this,
+                                                sizeof( vlc_object_t ) );
     vlc_object_attach( p_sys->p_worker_thread, p_this );
     if( vlc_thread_create( p_sys->p_worker_thread, "vnc worker thread",
                            vnc_worker_thread,
@@ -733,7 +733,7 @@ static void vnc_worker_thread( vlc_object_t *p_thread_obj )
 
     /* create the update request thread */
     p_sys->p_update_request_thread = vlc_object_create( p_filter,
-                                                        VLC_OBJECT_GENERIC );
+                                                     sizeof( vlc_object_t ) );
     vlc_object_attach( p_sys->p_update_request_thread, p_filter );
     if( vlc_thread_create( p_sys->p_update_request_thread,
                            "vnc update request thread",
@@ -809,7 +809,7 @@ static void vnc_worker_thread( vlc_object_t *p_thread_obj )
 
        }
 
-       if (p_sys->p_worker_thread->b_die ||
+       if (!vlc_object_alive (p_sys->p_worker_thread) ||
            p_sys->p_worker_thread->b_error)
        {
            p_sys->b_continue = false;
@@ -857,7 +857,7 @@ static void update_request_thread( vlc_object_t *p_thread_obj )
                 msg_Err( p_filter, "Could not write rfbFramebufferUpdateRequestMsg." );
                 p_sys->b_continue = false;
             }
-            if (p_sys->p_update_request_thread->b_die ||
+            if (!vlc_object_alive (p_sys->p_update_request_thread) ||
                 p_sys->p_update_request_thread->b_error)
             {
                 p_sys->b_continue = false;