Changeset b9e88f0787500ec44c407379fa963d4925158e91

Show
Ignore:
Timestamp:
07/05/08 14:29:47 (2 months ago)
Author:
Rémi Denis-Courmont <rdenis@simphalempin.com>
git-committer:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1215260987 +0300
git-parent:

[ec9483570abf7a1ac07699e2e54b9cc31ef654b6]

git-author:
Rémi Denis-Courmont <rdenis@simphalempin.com> 1215260969 +0300
Message:

Join and unload vout safely

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • src/video_output/video_output.c

    rec94835 rb9e88f0  
    132132        { 
    133133            spu_Attach( p_vout->p_spu, p_this, false ); 
     134            vlc_object_kill( p_vout ); 
     135            vlc_thread_join( p_vout ); 
     136            module_Unneed( p_vout, p_vout->p_module ); 
    134137            vlc_object_release( p_vout ); 
    135138        } 
    …… 
    447450 
    448451        /* Make sure the thread is destroyed and data released */ 
     452        vlc_object_kill( p_vout ); 
     453        vlc_thread_join( p_vout ); 
     454        module_Unneed( p_vout, p_vout->p_module ); 
    449455        vlc_object_release( p_vout ); 
    450456        return NULL; 
    …… 
    462468    vlc_mutex_destroy( &p_vout->change_lock ); 
    463469    vlc_mutex_destroy( &p_vout->vfilter_lock ); 
    464  
    465     /* Release the module */ 
    466     if( p_vout->p_module ) 
    467     { 
    468         module_Unneed( p_vout, p_vout->p_module ); 
    469     } 
    470470 
    471471    free( p_vout->psz_filter_chain );