Fix locking issues in (embedded) snapshot code

diff --git a/src/control/mediacontrol_audio_video.c b/src/control/mediacontrol_audio_video.c
index 212dc274be182a941bc7866538bc3137abc74973..0ff7c31c443ae5cbbebeb93c5a9be0329aab2ed4 100644 (file)
--- a/src/control/mediacontrol_audio_video.c
+++ b/src/control/mediacontrol_audio_video.c
@@ -84,6 +84,7 @@ mediacontrol_snapshot( mediacontrol_Instance *self,
     vlc_object_release( p_vout );
 
     p_snapshot = ( snapshot_t* ) p_cache->p_private;
+    vlc_mutex_unlock( &p_cache->object_lock );
     vlc_object_destroy( p_cache );
 
     if( p_snapshot )

diff --git a/src/video_output/vout_intf.c b/src/video_output/vout_intf.c
index 8680359366523e021958e825dcad23027ba509a1..3239a9e1c2297312ff9a6a6d916efad55f261eda 100644 (file)
--- a/src/video_output/vout_intf.c
+++ b/src/video_output/vout_intf.c
@@ -524,7 +524,6 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
             msg_Err( p_vout, "Could not get snapshot" );
             image_HandlerDelete( p_image );
             vlc_cond_signal( &p_dest->object_wait );
-            vlc_mutex_unlock( &p_dest->object_lock );
             vlc_object_release( p_dest );
             return VLC_EGENERIC;
         }
@@ -537,7 +536,6 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
             block_Release( p_block );
             image_HandlerDelete( p_image );
             vlc_cond_signal( &p_dest->object_wait );
-            vlc_mutex_unlock( &p_dest->object_lock );
             vlc_object_release( p_dest );
             return VLC_ENOMEM;
         }
@@ -555,7 +553,6 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
             free( p_snapshot );
             image_HandlerDelete( p_image );
             vlc_cond_signal( &p_dest->object_wait );
-            vlc_mutex_unlock( &p_dest->object_lock );
             vlc_object_release( p_dest );
             return VLC_ENOMEM;
         }
@@ -567,7 +564,6 @@ int vout_Snapshot( vout_thread_t *p_vout, picture_t *p_pic )
 
         /* Unlock the object */
         vlc_cond_signal( &p_dest->object_wait );
-        vlc_mutex_unlock( &p_dest->object_lock );
         vlc_object_release( p_dest );
 
         image_HandlerDelete( p_image );