thread: remove vlc_mutex_destroy()

include/vlc_cxx_helpers.hpp

@@ -281,10 +281,6 @@ public:
     {
         vlc_mutex_init( &m_mutex );
     }
-    ~mutex()
-    {
-        vlc_mutex_destroy( &m_mutex );
-    }
 
     mutex( const mutex& ) = delete;
     mutex& operator=( const mutex& ) = delete;

include/vlc_threads.h

@@ -344,13 +344,6 @@ VLC_API void vlc_mutex_init(vlc_mutex_t *);
  */
 VLC_API void vlc_mutex_init_recursive(vlc_mutex_t *);
 
-/**
- * Deinitializes a mutex.
- *
- * The mutex must not be locked, otherwise behaviour is undefined.
- */
-VLC_API void vlc_mutex_destroy(vlc_mutex_t *);
-
 /**
  * Acquires a mutex.
  *

lib/core.c

@@ -93,7 +93,6 @@ void libvlc_release( libvlc_instance_t *p_instance )
 
     if( refs == 0 )
     {
-        vlc_mutex_destroy( lock );
         libvlc_Quit( p_instance->p_libvlc_int );
         libvlc_InternalCleanup( p_instance->p_libvlc_int );
         libvlc_InternalDestroy( p_instance->p_libvlc_int );

lib/event.c

@@ -90,8 +90,6 @@ void libvlc_event_manager_init(libvlc_event_manager_t *em, void *obj)
 
 void libvlc_event_manager_destroy(libvlc_event_manager_t *em)
 {
-    vlc_mutex_destroy(&em->lock);
-
     for (size_t i = 0; i < vlc_array_count(&em->listeners); i++)
         free(vlc_array_item_at_index(&em->listeners, i));
 

lib/media.c

@@ -563,8 +563,6 @@ void libvlc_media_release( libvlc_media_t *p_md )
     input_item_Release( p_md->p_input_item );
 
     vlc_cond_destroy( &p_md->parsed_cond );
-    vlc_mutex_destroy( &p_md->parsed_lock );
-    vlc_mutex_destroy( &p_md->subitems_lock );
 
     /* Construct the event */
     libvlc_event_t event;

lib/media_list.c

@@ -202,8 +202,6 @@ void libvlc_media_list_release( libvlc_media_list_t * p_mlist )
         libvlc_media_release( p_md );
     }
 
-    vlc_mutex_destroy( &p_mlist->object_lock );
-    vlc_mutex_destroy( &p_mlist->refcount_lock );
     vlc_array_clear( &p_mlist->items );
 
     libvlc_release( p_mlist->p_libvlc_instance );

lib/media_list_player.c

@@ -498,8 +498,6 @@ libvlc_media_list_player_new(libvlc_instance_t * p_instance)
 error:
     libvlc_event_manager_destroy(&p_mlp->event_manager);
     vlc_cond_destroy(&p_mlp->seek_pending);
-    vlc_mutex_destroy(&p_mlp->mp_callback_lock);
-    vlc_mutex_destroy(&p_mlp->object_lock);
     free(p_mlp);
     return NULL;
 }
@@ -544,9 +542,6 @@ void libvlc_media_list_player_release(libvlc_media_list_player_t * p_mlp)
 
     libvlc_event_manager_destroy(&p_mlp->event_manager);
     vlc_cond_destroy(&p_mlp->seek_pending);
-    vlc_mutex_destroy(&p_mlp->mp_callback_lock);
-    vlc_mutex_destroy(&p_mlp->object_lock);
-
     free(p_mlp->current_playing_item_path);
     free(p_mlp);
 }

modules/access/bluray.c

@@ -476,10 +476,8 @@ static void unref_subpicture_updater(bluray_spu_updater_sys_t *p_sys)
     p_sys->p_overlay = NULL;
     vlc_mutex_unlock(&p_sys->lock);
 
-    if (refs < 1) {
-        vlc_mutex_destroy(&p_sys->lock);
+    if (refs < 1)
         free(p_sys);
-    }
 }
 
 /* Get a 3 char code
@@ -1131,10 +1129,6 @@ static void blurayClose(vlc_object_t *object)
 
     ARRAY_RESET(p_sys->events_delayed);
 
-    vlc_mutex_destroy(&p_sys->pl_info_lock);
-    vlc_mutex_destroy(&p_sys->bdj.lock);
-    vlc_mutex_destroy(&p_sys->read_block_lock);
-
     free(p_sys->psz_bd_path);
 }
 
@@ -1576,7 +1570,6 @@ static void bluray_esOutDestroy(es_out_t *p_out)
     for (size_t i = 0; i < vlc_array_count(&esout_priv->es); ++i)
         es_pair_Delete(vlc_array_item_at_index(&esout_priv->es, i));
     vlc_array_clear(&esout_priv->es);
-    vlc_mutex_destroy(&esout_priv->lock);
     free(esout_priv);
 }
 
@@ -1804,7 +1797,6 @@ static void blurayCloseOverlay(demux_t *p_demux, int plane)
         /* no references to this overlay exist in vo anymore */
         es_out_Control(p_sys->p_out, BLURAY_ES_OUT_CONTROL_DELETE_OVERLAY, plane);
 
-        vlc_mutex_destroy(&ov->lock);
         subpicture_region_ChainDelete(ov->p_regions);
         free(ov);
 

modules/access/decklink.cpp

@@ -782,7 +782,6 @@ static void Close(vlc_object_t *p_this)
     if (sys->delegate)
         sys->delegate->Release();
 
-    vlc_mutex_destroy(&sys->pts_lock);
     free(sys);
 }
 

modules/access/dshow/dshow.cpp

@@ -816,7 +816,6 @@ static void CommonClose( vlc_object_t *p_this, access_sys_t *p_sys )
 
     vlc_delete_all( p_sys->pp_streams );
 
-    vlc_mutex_destroy( &p_sys->lock );
     vlc_cond_destroy( &p_sys->wait );
 
     vlc_mta_release( p_this );

modules/access/dtv/bdagraph.cpp

@@ -321,7 +321,6 @@ BDAOutput::BDAOutput( vlc_object_t *p_access ) :
 BDAOutput::~BDAOutput()
 {
     Empty();
-    vlc_mutex_destroy( &lock );
     vlc_cond_destroy( &wait );
 }
 

modules/access/dv.c

@@ -238,7 +238,6 @@ static void Close( vlc_object_t *p_this )
             raw1394_iso_shutdown( p_sys->p_raw1394 );
 
         vlc_join( p_sys->p_ev->thread, NULL );
-        vlc_mutex_destroy( &p_sys->p_ev->lock );
 
         /* Cleanup frame data */
         if( p_sys->p_ev->p_frame )
@@ -256,8 +255,6 @@ static void Close( vlc_object_t *p_this )
         raw1394_destroy_handle( p_sys->p_raw1394 );
 
     AVCClose( p_access );
-
-    vlc_mutex_destroy( &p_sys->lock );
 }
 
 /*****************************************************************************

modules/access/dvdnav.c

@@ -487,8 +487,6 @@ static void Close( vlc_object_t *p_this )
     /* Stop still image handler */
     if( p_sys->still.b_created )
         vlc_timer_destroy( p_sys->still.timer );
-    vlc_mutex_destroy( &p_sys->still.lock );
-    vlc_mutex_destroy( &p_sys->event_lock );
 
     for( int i = 0; i < PS_TK_COUNT; i++ )
     {

modules/access/http/h2conn.c

@@ -740,7 +740,6 @@ static void vlc_h2_conn_destroy(struct vlc_h2_conn *conn)
 
     vlc_cancel(conn->thread);
     vlc_join(conn->thread, NULL);
-    vlc_mutex_destroy(&conn->lock);
 
     vlc_h2_output_destroy(conn->out);
     vlc_tls_Shutdown(conn->conn.tls, true);
@@ -796,7 +795,6 @@ struct vlc_http_conn *vlc_h2_conn_create(void *ctx, struct vlc_tls *tls)
      || vlc_clone(&conn->thread, vlc_h2_recv_thread, conn,
                   VLC_THREAD_PRIORITY_INPUT))
     {
-        vlc_mutex_destroy(&conn->lock);
         vlc_h2_output_destroy(conn->out);
         goto error;
     }

modules/access/http/h2output.c

@@ -323,7 +323,6 @@ struct vlc_h2_output *vlc_h2_output_create(struct vlc_tls *tls, bool client)
     if (vlc_clone(&out->thread, cb, out, VLC_THREAD_PRIORITY_INPUT))
     {
         vlc_cond_destroy(&out->wait);
-        vlc_mutex_destroy(&out->lock);
         free(out);
         out = NULL;
     }
@@ -341,7 +340,6 @@ void vlc_h2_output_destroy(struct vlc_h2_output *out)
     vlc_join(out->thread, NULL);
 
     vlc_cond_destroy(&out->wait);
-    vlc_mutex_destroy(&out->lock);
     /* Flush queues in case the thread was terminated within poll() and some
      * packets were still queued. */
     vlc_h2_output_flush_unlocked(out);

modules/access/mms/mmstu.c

@@ -110,7 +110,6 @@ int  MMSTUOpen( stream_t *p_access )
     {
         msg_Err( p_access, "invalid server name" );
         vlc_UrlClean( &p_sys->url );
-        vlc_mutex_destroy( &p_sys->lock_netwrite );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -147,7 +146,6 @@ int  MMSTUOpen( stream_t *p_access )
     {
         msg_Err( p_access, "cannot connect to server" );
         vlc_UrlClean( &p_sys->url );
-        vlc_mutex_destroy( &p_sys->lock_netwrite );
         free( p_sys );
         return VLC_EGENERIC;
     }

modules/access/rist.c

@@ -1035,8 +1035,6 @@ static void Clean( stream_t *p_access )
         free(p_sys->flow->buffer);
         free(p_sys->flow);
     }
-
-    vlc_mutex_destroy( &p_sys->lock );
 }
 
 static void Close(vlc_object_t *p_this)

modules/access/srt.c

@@ -390,8 +390,6 @@ static int Open(vlc_object_t *p_this)
     return VLC_SUCCESS;
 
 failed:
-    vlc_mutex_destroy( &p_sys->lock );
-
     if ( p_sys->sock != -1 ) srt_close( p_sys->sock );
     if ( p_sys->i_poll_id != -1 ) srt_epoll_release( p_sys->i_poll_id );
 
@@ -403,8 +401,6 @@ static void Close(vlc_object_t *p_this)
     stream_t     *p_stream = (stream_t*)p_this;
     stream_sys_t *p_sys = p_stream->p_sys;
 
-    vlc_mutex_destroy( &p_sys->lock );
-
     srt_epoll_remove_usock( p_sys->i_poll_id, p_sys->sock );
     srt_close( p_sys->sock );
     srt_epoll_release( p_sys->i_poll_id );

modules/access_output/rist.c

@@ -714,8 +714,6 @@ static void Clean( sout_access_out_t *p_access )
         free(p_sys->flow);
     }
 
-    vlc_mutex_destroy( &p_sys->lock );
-    vlc_mutex_destroy( &p_sys->fd_lock );
     if (p_sys->p_pktbuffer)
         block_Release(p_sys->p_pktbuffer);
 }

modules/access_output/srt.c

@@ -402,8 +402,6 @@ static int Open( vlc_object_t *p_this )
     return VLC_SUCCESS;
 
 failed:
-    vlc_mutex_destroy( &p_sys->lock );
-
     if ( p_sys->sock != -1 ) srt_close( p_sys->sock );
     if ( p_sys->i_poll_id != -1 ) srt_epoll_release( p_sys->i_poll_id );
 
@@ -415,8 +413,6 @@ static void Close( vlc_object_t * p_this )
     sout_access_out_t     *p_access = (sout_access_out_t*)p_this;
     sout_access_out_sys_t *p_sys = p_access->p_sys;
 
-    vlc_mutex_destroy( &p_sys->lock );
-
     srt_epoll_remove_usock( p_sys->i_poll_id, p_sys->sock );
     srt_close( p_sys->sock );
     srt_epoll_release( p_sys->i_poll_id );

modules/audio_filter/compressor.c

@@ -282,9 +282,6 @@ static void Close( vlc_object_t *p_this )
     var_DelCallback( p_aout, "compressor-knee", KneeCallback, p_sys );
     var_DelCallback( p_aout, "compressor-makeup-gain", MakeupGainCallback, p_sys );
 
-    /* Destroy the mutex */
-    vlc_mutex_destroy( &p_sys->lock );
-
     /* Destroy the filter parameter structure */
     free( p_sys );
 }

modules/audio_filter/equalizer.c

@@ -157,7 +157,6 @@ static int Open( vlc_object_t *p_this )
     vlc_mutex_init( &p_sys->lock );
     if( EqzInit( p_filter, p_filter->fmt_in.audio.i_rate ) != VLC_SUCCESS )
     {
-        vlc_mutex_destroy( &p_sys->lock );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -179,7 +178,6 @@ static void Close( vlc_object_t *p_this )
     filter_sys_t *p_sys = p_filter->p_sys;
 
     EqzClean( p_filter );
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys );
 }
 

modules/audio_filter/spatializer/spatializer.cpp

@@ -192,7 +192,6 @@ static void Close( vlc_object_t *p_this )
     }
 
     delete p_sys->p_reverbm;
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys );
     msg_Dbg( p_this, "Closing filter spatializer" );
 }

modules/audio_output/amem.c

@@ -394,6 +394,5 @@ static void Close (vlc_object_t *obj)
     audio_output_t *aout = (audio_output_t *)obj;
     aout_sys_t *sys = aout->sys;
 
-    vlc_mutex_destroy(&sys->lock);
     free (sys);
 }

modules/audio_output/audiotrack.c

@@ -2246,7 +2246,6 @@ Close( vlc_object_t *obj )
     audio_output_t *p_aout = (audio_output_t *) obj;
     aout_sys_t *p_sys = p_aout->sys;
 
-    vlc_mutex_destroy(&p_sys->lock);
     vlc_cond_destroy(&p_sys->aout_cond);
     vlc_cond_destroy(&p_sys->thread_cond);
     free( p_sys );

modules/audio_output/audiounit_ios.m

@@ -611,7 +611,6 @@ Close(vlc_object_t *obj)
 
     [sys->aoutWrapper release];
 
-    ca_Close(aout);
     free(sys);
 }
 
@@ -636,7 +635,6 @@ Open(vlc_object_t *obj)
     sys->aoutWrapper = [[AoutWrapper alloc] initWithAout:aout];
     if (sys->aoutWrapper == NULL)
     {
-        ca_Close(aout);
         free(sys);
         return VLC_ENOMEM;
     }

modules/audio_output/auhal.c

@@ -878,7 +878,6 @@ out:
     if (ret != VLC_SUCCESS)
         retValue = false;
 
-    vlc_mutex_destroy(&w.lock);
     vlc_cond_destroy(&w.cond);
 
     return retValue;
@@ -1689,10 +1688,6 @@ static void Close(vlc_object_t *obj)
     config_PutPsz("auhal-audio-device", psz_device);
     free(psz_device);
 
-    vlc_mutex_destroy(&p_sys->selected_device_lock);
-    vlc_mutex_destroy(&p_sys->device_list_lock);
-
-    ca_Close(p_aout);
     free(p_sys);
 }
 

modules/audio_output/coreaudio_common.c

@@ -82,13 +82,6 @@ lock_init(struct aout_sys_common *p_sys)
         vlc_mutex_init(&p_sys->lock.mutex);
 }
 
-static inline void
-lock_destroy(struct aout_sys_common *p_sys)
-{
-    if (unlikely(!os_unfair_lock_lock))
-        vlc_mutex_destroy(&p_sys->lock.mutex);
-}
-
 static inline void
 lock_lock(struct aout_sys_common *p_sys)
 {
@@ -129,14 +122,6 @@ ca_Open(audio_output_t *p_aout)
     return VLC_SUCCESS;
 }
 
-void
-ca_Close(audio_output_t *p_aout)
-{
-    struct aout_sys_common *p_sys = (struct aout_sys_common *) p_aout->sys;
-
-    lock_destroy(p_sys);
-}
-
 /* Called from render callbacks. No lock, wait, and IO here */
 void
 ca_Render(audio_output_t *p_aout, uint32_t i_frames, uint64_t i_host_time,

modules/audio_output/coreaudio_common.h

@@ -47,8 +47,7 @@
 
 struct aout_sys_common
 {
-    /* The following is owned by common.c (initialized from ca_Open, cleaned
-     * from ca_Close) */
+    /* The following is owned by common.c (initialized from ca_Open) */
 
     mach_timebase_info_data_t tinfo;
 
@@ -87,8 +86,6 @@ struct aout_sys_common
 
 int ca_Open(audio_output_t *p_aout);
 
-void ca_Close(audio_output_t *p_aout);
-
 void ca_Render(audio_output_t *p_aout, uint32_t i_nb_samples, uint64_t i_host_time,
                uint8_t *p_output, size_t i_requested);
 

modules/audio_output/directsound.c

@@ -553,7 +553,6 @@ static HRESULT Stop( aout_stream_sys_t *p_sys )
     vlc_cancel( p_sys->eraser_thread );
     vlc_join( p_sys->eraser_thread, NULL );
     vlc_cond_destroy( &p_sys->cond );
-    vlc_mutex_destroy( &p_sys->lock );
 
     if( p_sys->p_notify != NULL )
     {
@@ -661,7 +660,6 @@ static HRESULT Start( vlc_object_t *obj, aout_stream_sys_t *sys,
         }
         else
         {
-            vlc_mutex_destroy(&sys->lock);
             vlc_cond_destroy(&sys->cond);
             return E_FAIL;
         }
@@ -808,7 +806,6 @@ static HRESULT Start( vlc_object_t *obj, aout_stream_sys_t *sys,
 
 error:
     vlc_cond_destroy(&sys->cond);
-    vlc_mutex_destroy(&sys->lock);
 
     if( sys->p_notify != NULL )
     {

modules/audio_output/kai.c

@@ -371,7 +371,6 @@ static void DestroyBuffer( audio_output_t *aout )
     aout_sys_t     *sys = aout->sys;
     audio_buffer_t *buffer = sys->buffer;
 
-    vlc_mutex_destroy( &buffer->mutex );
     vlc_cond_destroy( &buffer->cond );
 
     free( buffer->data );

modules/audio_output/opensles_android.c

@@ -521,7 +521,6 @@ static void Close(vlc_object_t *obj)
     Destroy(sys->outputMixObject);
     Destroy(sys->engineObject);
     dlclose(sys->p_so_handle);
-    vlc_mutex_destroy(&sys->lock);
     free(sys);
 }
 

modules/audio_output/waveout.c

@@ -824,7 +824,6 @@ static void Close(vlc_object_t *obj)
 
     vlc_timer_destroy( sys->volume_poll_timer );
     vlc_cond_destroy( &sys->cond );
-    vlc_mutex_destroy( &sys->lock );
 
     free(sys);
 }

modules/codec/avcodec/video.c

@@ -693,7 +693,6 @@ int InitVideoDec( vlc_object_t *obj )
     /* ***** Open the codec ***** */
     if( OpenVideoCodec( p_dec ) < 0 )
     {
-        vlc_mutex_destroy( &p_sys->lock );
         free( p_sys );
         avcodec_free_context( &p_context );
         return VLC_EGENERIC;
@@ -1403,7 +1402,6 @@ void EndVideoDec( vlc_object_t *obj )
     if( p_sys->p_va )
         vlc_va_Delete( p_sys->p_va );
 
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys );
 }
 

modules/codec/dmo/dmo.c

@@ -275,7 +275,6 @@ found:
 error:
     vlc_cond_destroy( &p_sys->wait_input );
     vlc_cond_destroy( &p_sys->wait_output );
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys );
     return VLC_ENOMEM;
 }
@@ -296,7 +295,6 @@ static void DecoderClose( vlc_object_t *p_this )
     vlc_join( p_sys->thread, NULL );
     vlc_cond_destroy( &p_sys->wait_input );
     vlc_cond_destroy( &p_sys->wait_output );
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys );
 }
 

modules/codec/kate.c

@@ -1308,7 +1308,6 @@ static void DecSysRelease( decoder_sys_t *p_sys )
     }
 
     vlc_mutex_unlock( &p_sys->lock );
-    vlc_mutex_destroy( &p_sys->lock );
 
 #ifdef HAVE_TIGER
     if( p_sys->p_tr )

modules/codec/libass.c

@@ -303,7 +303,6 @@ static void DecSysRelease( decoder_sys_t *p_sys )
         return;
     }
     vlc_mutex_unlock( &p_sys->lock );
-    vlc_mutex_destroy( &p_sys->lock );
 
     if( p_sys->p_track )
         ass_free_track( p_sys->p_track );

modules/codec/omxil/mediacodec.c

@@ -1004,7 +1004,6 @@ static void AbortDecoderLocked(decoder_t *p_dec)
 
 static void CleanDecoder(decoder_sys_t *p_sys)
 {
-    vlc_mutex_destroy(&p_sys->lock);
     vlc_cond_destroy(&p_sys->cond);
     vlc_cond_destroy(&p_sys->dec_cond);
 

modules/codec/omxil/omxil_utils.h

@@ -88,8 +88,7 @@ static inline OMX_TICKS ToOmxTicks(int64_t value)
          (p_fifo)->pp_last = &(p_fifo)->p_first; } while(0)
 
 #define OMX_FIFO_DESTROY(p_fifo) \
-    do { vlc_mutex_destroy( &(p_fifo)->lock ); \
-         vlc_cond_destroy (&(p_fifo)->wait); } while(0)
+    do { vlc_cond_destroy (&(p_fifo)->wait); } while(0)
 
 #define OMX_FIFO_PEEK(p_fifo, p_buffer) \
          p_buffer = (p_fifo)->p_first;

modules/codec/omxil/utils.c

@@ -50,7 +50,6 @@ void InitOmxEventQueue(OmxEventQueue *queue)
 
 void DeinitOmxEventQueue(OmxEventQueue *queue)
 {
-    vlc_mutex_destroy(&queue->mutex);
     vlc_cond_destroy(&queue->cond);
 }
 

modules/codec/videotoolbox.c

@@ -1304,7 +1304,6 @@ static void pic_pacer_Destroy(void *priv)
 {
     struct pic_pacer *pic_pacer = priv;
 
-    vlc_mutex_destroy(&pic_pacer->lock);
     vlc_cond_destroy(&pic_pacer->wait);
 }
 
@@ -1495,8 +1494,6 @@ static void CloseDecoder(vlc_object_t *p_this)
     if(p_sys->pf_codec_clean)
         p_sys->pf_codec_clean(p_dec);
 
-    vlc_mutex_destroy(&p_sys->lock);
-
     vlc_video_context_Release(p_sys->vctx);
 
     free(p_sys);

modules/codec/zvbi.c

@@ -288,8 +288,6 @@ static void Close( vlc_object_t *p_this )
     var_DelCallback( p_dec, "vbi-opaque", Opaque, p_sys );
     var_DelCallback( p_dec, "vbi-page", RequestPage, p_sys );
 
-    vlc_mutex_destroy( &p_sys->lock );
-
     if( p_sys->p_vbi_dec )
         vbi_decoder_delete( p_sys->p_vbi_dec );
     free( p_sys );

modules/control/dbus/dbus.c

@@ -346,8 +346,6 @@ playlist_listener_failure:
     dbus_connection_unref( p_conn );
 
 dbus_connection_failure:
-    vlc_mutex_destroy( &p_sys->lock );
-
     vlc_close( p_sys->p_pipe_fds[1] );
     vlc_close( p_sys->p_pipe_fds[0] );
 
@@ -387,7 +385,6 @@ static void Close   ( vlc_object_t *p_this )
         callback_info_t* info = vlc_array_item_at_index( &p_sys->events, i );
         free( info );
     }
-    vlc_mutex_destroy( &p_sys->lock );
     vlc_array_clear( &p_sys->events );
     vlc_array_clear( &p_sys->timeouts );
     vlc_array_clear( &p_sys->watches );

modules/control/gestures.c

@@ -161,7 +161,6 @@ static int Open ( vlc_object_t *p_this )
 
 error:
     vlc_vector_clear(&p_sys->vout_vector);
-    vlc_mutex_destroy( &p_sys->lock );
     free(p_sys);
     return VLC_EGENERIC;
 }
@@ -198,7 +197,6 @@ static void Close ( vlc_object_t *p_this )
     vlc_vector_clear(&p_sys->vout_vector);
 
     /* Destroy structure */
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys );
 }
 

modules/control/globalhotkeys/win32.c

@@ -79,7 +79,6 @@ static int Open( vlc_object_t *p_this )
 
     if( vlc_clone( &p_sys->thread, Thread, p_intf, VLC_THREAD_PRIORITY_LOW ) )
     {
-        vlc_mutex_destroy( &p_sys->lock );
         vlc_cond_destroy( &p_sys->wait );
         free( p_sys );
         p_intf->p_sys = NULL;
@@ -94,7 +93,6 @@ static int Open( vlc_object_t *p_this )
     {
         vlc_mutex_unlock( &p_sys->lock );
         vlc_join( p_sys->thread, NULL );
-        vlc_mutex_destroy( &p_sys->lock );
         vlc_cond_destroy( &p_sys->wait );
         free( p_sys );
         p_intf->p_sys = NULL;
@@ -121,7 +119,6 @@ static void Close( vlc_object_t *p_this )
     vlc_mutex_unlock( &p_sys->lock );
 
     vlc_join( p_sys->thread, NULL );
-    vlc_mutex_destroy( &p_sys->lock );
     vlc_cond_destroy( &p_sys->wait );
     free( p_sys );
 }

modules/control/rc.c

@@ -1891,7 +1891,6 @@ error:
     }
     net_ListenClose( pi_socket );
     free( psz_unix_path );
-    vlc_mutex_destroy( &p_sys->status_lock );
     free( p_sys );
     return VLC_EGENERIC;
 }
@@ -1923,7 +1922,6 @@ static void Deactivate( vlc_object_t *p_this )
         free( p_sys->psz_unix_path );
     }
 #endif
-    vlc_mutex_destroy( &p_sys->status_lock );
     free( p_sys );
 }
 

modules/demux/adaptive/PlaylistManager.cpp

@@ -90,10 +90,7 @@ PlaylistManager::~PlaylistManager   ()
     delete logic;
     delete resources;
     vlc_cond_destroy(&waitcond);
-    vlc_mutex_destroy(&lock);
-    vlc_mutex_destroy(&demux.lock);
     vlc_cond_destroy(&demux.cond);
-    vlc_mutex_destroy(&cached.lock);
 }
 
 void PlaylistManager::unsetPeriod()

modules/demux/adaptive/Streams.cpp

@@ -119,8 +119,6 @@ AbstractStream::~AbstractStream()
     delete demuxer;
     delete demuxersource;
     delete fakeesout;
-
-    vlc_mutex_destroy(&lock);
 }
 
 void AbstractStream::prepareRestart(bool b_discontinuity)

modules/demux/adaptive/encryption/Keyring.cpp

@@ -39,7 +39,6 @@ Keyring::Keyring(vlc_object_t *obj_)
 
 Keyring::~Keyring()
 {
-    vlc_mutex_destroy(&lock);
 }
 
 KeyringKey Keyring::getKey(SharedResources *resources, const std::string &uri)

modules/demux/adaptive/http/Chunk.cpp

@@ -157,7 +157,6 @@ HTTPChunkSource::~HTTPChunkSource()
 {
     if(connection)
         connection->setUsed(false);
-    vlc_mutex_destroy(&lock);
 }
 
 bool HTTPChunkSource::init(const std::string &url)

modules/demux/adaptive/http/Downloader.cpp

@@ -58,7 +58,6 @@ Downloader::~Downloader()
 
     if(thread_handle_valid)
         vlc_join(thread_handle, NULL);
-    vlc_mutex_destroy(&lock);
     vlc_cond_destroy(&waitcond);
 }
 void Downloader::schedule(HTTPChunkBufferedSource *source)

modules/demux/adaptive/http/HTTPConnectionManager.cpp

@@ -74,7 +74,6 @@ HTTPConnectionManager::~HTTPConnectionManager   ()
     delete downloader;
     delete factory;
     this->closeAllConnections();
-    vlc_mutex_destroy(&lock);
 }
 
 void HTTPConnectionManager::closeAllConnections      ()

modules/demux/adaptive/logic/NearOptimalAdaptationLogic.cpp

@@ -60,7 +60,6 @@ NearOptimalAdaptationLogic::NearOptimalAdaptationLogic(vlc_object_t *obj)
 
 NearOptimalAdaptationLogic::~NearOptimalAdaptationLogic()
 {
-    vlc_mutex_destroy(&lock);
 }
 
 BaseRepresentation *

modules/demux/adaptive/logic/PredictiveAdaptationLogic.cpp

@@ -63,7 +63,6 @@ PredictiveAdaptationLogic::PredictiveAdaptationLogic(vlc_object_t *obj)
 
 PredictiveAdaptationLogic::~PredictiveAdaptationLogic()
 {
-    vlc_mutex_destroy(&lock);
 }
 
 BaseRepresentation *PredictiveAdaptationLogic::getNextRepresentation(BaseAdaptationSet *adaptSet, BaseRepresentation *prevRep)

modules/demux/adaptive/logic/RateBasedAdaptationLogic.cpp

@@ -49,7 +49,6 @@ RateBasedAdaptationLogic::RateBasedAdaptationLogic  (vlc_object_t *obj) :
 
 RateBasedAdaptationLogic::~RateBasedAdaptationLogic()
 {
-    vlc_mutex_destroy(&lock);
 }
 
 BaseRepresentation *RateBasedAdaptationLogic::getNextRepresentation(BaseAdaptationSet *adaptSet, BaseRepresentation *currep)

modules/demux/adaptive/plumbing/FakeESOut.cpp

@@ -165,7 +165,6 @@ FakeESOut::~FakeESOut()
     gc();
 
     delete commandsqueue;
-    vlc_mutex_destroy(&lock);
 }
 
 void FakeESOut::resetTimestamps()

modules/demux/mkv/demux.cpp

@@ -45,8 +45,6 @@ demux_sys_t::~demux_sys_t()
 
     while( titles.size() )
     { vlc_input_title_Delete( titles.back() ); titles.pop_back();}
-
-    vlc_mutex_destroy( &lock_demuxer );
 }
 
 

modules/demux/mkv/events.cpp

@@ -43,7 +43,6 @@ event_thread_t::~event_thread_t()
 {
     ResetPci();
     vlc_cond_destroy( &wait );
-    vlc_mutex_destroy( &lock );
 }
 
 void event_thread_t::SetPci(const pci_t *data)

modules/demux/mpeg/ts.c

@@ -417,14 +417,12 @@ static int Open( vlc_object_t *p_this )
     patpid = GetPID(p_sys, 0);
     if ( !PIDSetup( p_demux, TYPE_PAT, patpid, NULL ) )
     {
-        vlc_mutex_destroy( &p_sys->csa_lock );
         free( p_sys );
         return VLC_ENOMEM;
     }
     if( !ts_psi_PAT_Attach( patpid, p_demux ) )
     {
         PIDRelease( p_demux, patpid );
-        vlc_mutex_destroy( &p_sys->csa_lock );
         free( p_sys );
         return VLC_EGENERIC;
     }
@@ -586,8 +584,6 @@ static void Close( vlc_object_t *p_this )
         vlc_stream_Delete( p_sys->arib.b25stream );
     }
 
-    vlc_mutex_destroy( &p_sys->csa_lock );
-
     /* Release all non default pids */
     ts_pid_list_Release( p_demux, &p_sys->pids );
 

modules/gui/ncurses.c

@@ -1760,7 +1760,6 @@ static void Close(vlc_object_t *p_this)
     endwin();   /* Close the ncurses interface */
 
     vlc_LogSet(vlc_object_instance(p_this), NULL, NULL);
-    vlc_mutex_destroy(&sys->msg_lock);
     for(unsigned i = 0; i < sizeof sys->msgs / sizeof *sys->msgs; i++) {
         if (sys->msgs[i].item)
             msg_Free(sys->msgs[i].item);

modules/gui/qt/medialibrary/mlbasemodel.cpp

@@ -44,7 +44,6 @@ MLBaseModel::MLBaseModel(QObject *parent)
 
 MLBaseModel::~MLBaseModel()
 {
-    vlc_mutex_destroy( &m_item_lock );
 }
 
 void MLBaseModel::sortByColumn(QByteArray name, Qt::SortOrder order)

modules/gui/skins2/commands/async_queue.cpp

@@ -45,7 +45,6 @@ AsyncQueue::AsyncQueue( intf_thread_t *pIntf ): SkinObject( pIntf ),
 AsyncQueue::~AsyncQueue()
 {
     delete( m_pTimer );
-    vlc_mutex_destroy( &m_lock );
 }
 
 

modules/gui/skins2/commands/cmd_callbacks.hpp

@@ -71,7 +71,6 @@ public:
     virtual ~CmdExecuteBlock()
     {
         vlc_cond_destroy( &m_wait );
-        vlc_mutex_destroy( &m_lock );
     }
 
     static void executeWait( const CmdGenericPtr& rcCommand  )

modules/hw/d3d11/d3d11_surface.c

@@ -830,7 +830,6 @@ void D3D11CloseConverter( vlc_object_t *obj )
     D3D11_ReleaseProcessor( &p_sys->d3d_proc );
 #endif
     CopyCleanCache(&p_sys->cache);
-    vlc_mutex_destroy(&p_sys->staging_lock);
     if (p_sys->staging)
         ID3D11Texture2D_Release(p_sys->staging);
 }

modules/hw/mmal/codec.c

@@ -586,8 +586,6 @@ static void CloseDecoder(vlc_object_t *p_this)
 
     hw_mmal_port_pool_ref_release(sys->ppr, false);
 
-    vlc_mutex_destroy(&sys->pic_lock);
-
     if (sys->vctx)
         vlc_video_context_Release(sys->vctx);
 

modules/hw/mmal/converter.c

@@ -782,8 +782,6 @@ void CloseConverter(vlc_object_t * obj)
     if (sys->dec_dev)
         vlc_decoder_device_Release(sys->dec_dev);
 
-    vlc_mutex_destroy(&sys->lock);
-
     p_filter->p_sys = NULL;
     free(sys);
 }

modules/hw/mmal/mmal_cma.c

@@ -98,7 +98,6 @@ static void cma_pool_fixed_delete(cma_pool_fixed_t * const p)
     free(p->name);
 
     vlc_cond_destroy(&p->flight_cond);
-    vlc_mutex_destroy(&p->lock);
     free(p);
 
     // Inform our container that we are dead (if it cares)

modules/hw/mmal/mmal_picture.c

@@ -1201,8 +1201,6 @@ static void hw_mmal_vzc_pool_delete(vzc_pool_ctl_t * const pc)
     if (pc->buf_pool != NULL)
         mmal_pool_destroy(pc->buf_pool);
 
-    vlc_mutex_destroy(&pc->lock);
-
 //    memset(pc, 0xba, sizeof(*pc)); // Zap for (hopefully) faster crash
     free (pc);
 }

modules/hw/mmal/vout.c

@@ -1071,8 +1071,6 @@ static void CloseMmalVout(vout_display_t * vd)
 
     hw_mmal_vzc_pool_release(sys->vzc);
 
-    vlc_mutex_destroy(&sys->manage_mutex);
-
     if (sys->native_interlaced) {
         if (vc_gencmd(response, sizeof(response), "hvs_update_fields 0") < 0 ||
                 response[18] != '0')

modules/keystore/memory.c

@@ -147,7 +147,6 @@ Close(vlc_object_t *p_this)
     vlc_keystore_sys *p_sys = p_keystore->p_sys;
 
     ks_list_free(&p_sys->list);
-    vlc_mutex_destroy(&p_keystore->p_sys->lock);
     free(p_sys);
 }
 

modules/lua/extension.c

@@ -176,8 +176,6 @@ void Close_Extension( vlc_object_t *p_this )
         free( p_ext->psz_version );
         free( p_ext->p_icondata );
 
-        vlc_mutex_destroy( &p_ext->p_sys->running_lock );
-        vlc_mutex_destroy( &p_ext->p_sys->command_lock );
         vlc_cond_destroy( &p_ext->p_sys->wait );
         vlc_timer_destroy( p_ext->p_sys->timer );
 
@@ -185,8 +183,6 @@ void Close_Extension( vlc_object_t *p_this )
         free( p_ext );
     }
 
-    vlc_mutex_destroy( &p_mgr->lock );
-
     ARRAY_RESET( p_mgr->extensions );
 }
 
@@ -488,8 +484,6 @@ exit:
         free( p_ext->psz_description );
         free( p_ext->psz_shortdescription );
         free( p_ext->psz_version );
-        vlc_mutex_destroy( &p_ext->p_sys->command_lock );
-        vlc_mutex_destroy( &p_ext->p_sys->running_lock );
         vlc_cond_destroy( &p_ext->p_sys->wait );
         free( p_ext->p_sys );
         free( p_ext );

modules/lua/libs/dialog.c

@@ -287,7 +287,6 @@ static int vlclua_dialog_delete( lua_State *L )
     ARRAY_RESET( p_dlg->widgets );
 
     /* Note: At this point, the UI must not use these resources */
-    vlc_mutex_destroy( &p_dlg->lock );
     vlc_cond_destroy( &p_dlg->cond );
     free( p_dlg );
 

modules/lua/services_discovery.c

@@ -240,7 +240,6 @@ int Open_LuaSD( vlc_object_t *p_this )
     {
         TAB_CLEAN( p_sys->i_query, p_sys->ppsz_query );
         vlc_cond_destroy( &p_sys->cond );
-        vlc_mutex_destroy( &p_sys->lock );
         goto error;
     }
     return VLC_SUCCESS;
@@ -269,7 +268,6 @@ void Close_LuaSD( vlc_object_t *p_this )
     TAB_CLEAN( p_sys->i_query, p_sys->ppsz_query );
 
     vlc_cond_destroy( &p_sys->cond );
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys->psz_filename );
     lua_close( p_sys->L );
     free( p_sys );

modules/misc/audioscrobbler.c

@@ -422,7 +422,6 @@ fail:
         if (p_sys->player_listener)
         {
             vlc_cond_destroy(&p_sys->wait);
-            vlc_mutex_destroy(&p_sys->lock);
             vlc_player_RemoveListener(player, p_sys->player_listener);
         }
         vlc_playlist_RemoveListener(playlist, p_sys->playlist_listener);
@@ -452,7 +451,6 @@ static void Close(vlc_object_t *p_this)
     vlc_UrlClean(&p_sys->p_nowp_url);
 
     vlc_cond_destroy(&p_sys->wait);
-    vlc_mutex_destroy(&p_sys->lock);
 
     vlc_playlist_Lock(playlist);
     vlc_player_RemoveListener(

modules/misc/fingerprinter.c

@@ -298,7 +298,6 @@ static void CleanSys( fingerprinter_sys_t *p_sys )
     for ( size_t i = 0; i < vlc_array_count( &p_sys->incoming.queue ); i++ )
         fingerprint_request_Delete( vlc_array_item_at_index( &p_sys->incoming.queue, i ) );
     vlc_array_clear( &p_sys->incoming.queue );
-    vlc_mutex_destroy( &p_sys->incoming.lock );
 
     for ( size_t i = 0; i < vlc_array_count( &p_sys->processing.queue ); i++ )
         fingerprint_request_Delete( vlc_array_item_at_index( &p_sys->processing.queue, i ) );
@@ -308,7 +307,6 @@ static void CleanSys( fingerprinter_sys_t *p_sys )
     for ( size_t i = 0; i < vlc_array_count( &p_sys->results.queue ); i++ )
         fingerprint_request_Delete( vlc_array_item_at_index( &p_sys->results.queue, i ) );
     vlc_array_clear( &p_sys->results.queue );
-    vlc_mutex_destroy( &p_sys->results.lock );
 
     vlc_player_Lock(p_sys->player);
     vlc_player_RemoveListener(p_sys->player, p_sys->listener_id);

modules/misc/rtsp.c

@@ -462,8 +462,6 @@ static void MediaDel( vod_t *p_vod, vod_media_t *p_media )
         MediaDelES( p_vod, p_media, &p_media->es[0]->fmt );
     TAB_CLEAN( p_media->i_es, p_media->es );
 
-    vlc_mutex_destroy( &p_media->lock );
-
     free( p_media );
 }
 

modules/misc/securetransport.c

@@ -619,8 +619,6 @@ static int st_SessionShutdown (vlc_tls_t *session, bool duplex) {
 
     msg_Dbg(sys->obj, "shutdown TLS session");
 
-    vlc_mutex_destroy(&sys->lock);
-
     OSStatus ret = noErr;
     VLC_UNUSED(duplex);
 

modules/mux/mpeg/ts.c

@@ -769,7 +769,6 @@ static void Close( vlc_object_t * p_this )
         var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa2-ck", ChangeKeyCallback, NULL );
         var_DelCallback( p_mux, SOUT_CFG_PREFIX "csa-use", ActiveKeyCallback, NULL );
         csa_Delete( p_sys->csa );
-        vlc_mutex_destroy( &p_sys->csa_lock );
     }
 
     for (int i = 0; i < MAX_SDT_DESC; i++ )

modules/notify/notify.c

@@ -170,7 +170,6 @@ static void Close( vlc_object_t *p_this )
         g_object_unref( p_sys->notification );
     }
 
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys );
     notify_uninit();
 }

modules/services_discovery/podcast.c

@@ -151,7 +151,6 @@ static int Open( vlc_object_t *p_this )
         var_DelCallback( pl, "podcast-request", Request, p_sys );
         var_DelCallback( pl, "podcast-urls", UrlsChange, p_sys );
         vlc_cond_destroy( &p_sys->wait );
-        vlc_mutex_destroy( &p_sys->lock );
         free (p_sys);
         return VLC_EGENERIC;
     }
@@ -173,7 +172,6 @@ static void Close( vlc_object_t *p_this )
     var_DelCallback( pl, "podcast-urls", UrlsChange, p_sys );
     var_DelCallback( pl, "podcast-request", Request, p_sys );
     vlc_cond_destroy( &p_sys->wait );
-    vlc_mutex_destroy( &p_sys->lock );
 
     for( int i = 0; i < p_sys->i_urls; i++ )
          free( p_sys->ppsz_urls[i] );

modules/spu/audiobargraph_v.c

@@ -602,8 +602,6 @@ static void Close(vlc_object_t *p_this)
     if (p_sys->p_blend)
         filter_DeleteBlend(p_sys->p_blend);
 
-    vlc_mutex_destroy(&p_sys->lock);
-
     if (p_sys->p_BarGraph.p_pic)
         picture_Release(p_sys->p_BarGraph.p_pic);
 

modules/spu/dynamicoverlay/dynamicoverlay.c

@@ -148,7 +148,6 @@ static void Destroy( vlc_object_t *p_this )
     var_DelCallback( p_filter, "overlay-input", AdjustCallback, p_sys );
     var_DelCallback( p_filter, "overlay-output", AdjustCallback, p_sys );
 
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys->psz_inputfile );
     free( p_sys->psz_outputfile );
     free( p_sys );

modules/spu/logo.c

@@ -321,7 +321,6 @@ static void Close( vlc_object_t *p_this )
     if( p_sys->p_blend )
         filter_DeleteBlend( p_sys->p_blend );
 
-    vlc_mutex_destroy( &p_sys->lock );
     LogoListUnload( &p_sys->list );
     free( p_sys );
 }

modules/spu/marq.c

@@ -255,7 +255,6 @@ static void DestroyFilter( vlc_object_t *p_this )
     DEL_VAR( "marq-color" );
     DEL_VAR( "marq-size" );
 
-    vlc_mutex_destroy( &p_sys->lock );
     text_style_Delete( p_sys->p_style );
     free( p_sys->format );
     free( p_sys->filepath );

modules/spu/mosaic.c

@@ -421,7 +421,6 @@ static void DestroyFilter( vlc_object_t *p_this )
         p_sys->i_offsets_length = 0;
     }
 
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys );
 }
 

modules/spu/rss.c

@@ -308,10 +308,7 @@ static int CreateFilter( vlc_object_t *p_this )
 
     /* Create and arm the timer */
     if( vlc_timer_create( &p_sys->timer, Fetch, p_filter ) )
-    {
-        vlc_mutex_destroy( &p_sys->lock );
         goto error;
-    }
     vlc_timer_schedule_asap( p_sys->timer, vlc_tick_from_sec(i_ttl) );
 
     free( psz_urls );
@@ -334,7 +331,6 @@ static void DestroyFilter( vlc_object_t *p_this )
     filter_sys_t *p_sys = p_filter->p_sys;
 
     vlc_timer_destroy( p_sys->timer );
-    vlc_mutex_destroy( &p_sys->lock );
 
     text_style_Delete( p_sys->p_style );
     free( p_sys->psz_marquee );

modules/spu/subsdelay.c

@@ -518,8 +518,6 @@ static void SubsdelayHeapDestroy( subsdelay_heap_t *p_heap )
     }
 
     SubsdelayHeapUnlock( p_heap );
-
-    vlc_mutex_destroy( &p_heap->lock );
 }
 
 /*****************************************************************************

modules/stream_filter/decomp.c

@@ -328,7 +328,6 @@ static int Open (stream_t *stream, const char *path)
     {
         if (p_sys->pid != -1)
             while (waitpid (p_sys->pid, &(int){ 0 }, 0) == -1);
-        vlc_mutex_destroy (&p_sys->lock);
         vlc_cond_destroy (&p_sys->wait);
         free (p_sys);
         return ret;
@@ -361,7 +360,6 @@ static void Close (vlc_object_t *obj)
     while (waitpid (p_sys->pid, &status, 0) == -1);
     msg_Dbg (obj, "exit status %d", status);
 
-    vlc_mutex_destroy (&p_sys->lock);
     vlc_cond_destroy (&p_sys->wait);
     free (p_sys);
 }

modules/stream_filter/hds/hds.c

@@ -1222,9 +1222,7 @@ static void cleanup_Manifest( manifest_t *m )
 
 static void cleanup_threading( hds_stream_t *stream )
 {
-    vlc_mutex_destroy( &stream->dl_lock );
     vlc_cond_destroy( &stream->dl_cond );
-    vlc_mutex_destroy( &stream->abst_lock );
 }
 
 static void write_int_24( uint8_t *p, uint32_t val )

modules/stream_filter/prefetch.c

@@ -496,7 +496,6 @@ static int Open(vlc_object_t *obj)
     {
         vlc_cond_destroy(&sys->wait_space);
         vlc_cond_destroy(&sys->wait_data);
-        vlc_mutex_destroy(&sys->lock);
         vlc_interrupt_destroy(sys->interrupt);
         goto error;
     }
@@ -529,7 +528,6 @@ static void Close (vlc_object_t *obj)
     vlc_interrupt_destroy(sys->interrupt);
     vlc_cond_destroy(&sys->wait_space);
     vlc_cond_destroy(&sys->wait_data);
-    vlc_mutex_destroy(&sys->lock);
 
     while(sys->controls)
     {

modules/stream_out/chromecast/cast.cpp

@@ -113,7 +113,6 @@ struct sout_stream_sys_t
 
     ~sout_stream_sys_t()
     {
-        vlc_mutex_destroy(&lock);
     }
 
     bool canDecodeVideo( vlc_fourcc_t i_codec ) const;

modules/stream_out/rtp.c

@@ -553,9 +553,6 @@ static int Open( vlc_object_t *p_this )
         {
             msg_Err( p_stream, "unsupported muxer type for RTP (only TS/PS)" );
             free( psz );
-            vlc_mutex_destroy( &p_sys->lock_sdp );
-            vlc_mutex_destroy( &p_sys->lock_ts );
-            vlc_mutex_destroy( &p_sys->lock_es );
             free( p_sys->psz_vod_session );
             free( p_sys->psz_destination );
             free( p_sys );
@@ -570,9 +567,6 @@ static int Open( vlc_object_t *p_this )
         {
             msg_Err( p_stream, "cannot create muxer" );
             sout_AccessOutDelete( p_sys->p_grab );
-            vlc_mutex_destroy( &p_sys->lock_sdp );
-            vlc_mutex_destroy( &p_sys->lock_ts );
-            vlc_mutex_destroy( &p_sys->lock_es );
             free( p_sys->psz_vod_session );
             free( p_sys->psz_destination );
             free( p_sys );
@@ -662,10 +656,6 @@ static void Close( vlc_object_t * p_this )
     if( p_sys->rtsp != NULL )
         RtspUnsetup( p_sys->rtsp );
 
-    vlc_mutex_destroy( &p_sys->lock_sdp );
-    vlc_mutex_destroy( &p_sys->lock_ts );
-    vlc_mutex_destroy( &p_sys->lock_es );
-
     if( p_sys->p_httpd_file )
         httpd_FileDelete( p_sys->p_httpd_file );
 
@@ -1251,8 +1241,6 @@ static void Del( sout_stream_t *p_stream, void *_id )
         srtp_destroy( id->srtp );
 #endif
 
-    vlc_mutex_destroy( &id->lock_sink );
-
     /* Update SDP (sap/file) */
     if( p_sys->b_export_sap ) SapSetup( p_stream );
     if( p_sys->psz_sdp_file != NULL ) FileSetup( p_stream );

modules/stream_out/rtsp.c

@@ -151,8 +151,6 @@ void RtspUnsetup( rtsp_stream_t *rtsp )
         vlc_timer_destroy(rtsp->timer);
 
     free( rtsp->psz_path );
-    vlc_mutex_destroy( &rtsp->lock );
-
     free( rtsp );
 }
 

modules/stream_out/sdi/DBMSDIOutput.cpp

@@ -92,7 +92,6 @@ DBMSDIOutput::~DBMSDIOutput()
         p_card->Release();
 
     vlc_cond_destroy(&feeder.cond);
-    vlc_mutex_destroy(&feeder.lock);
 }
 
 AbstractStream *DBMSDIOutput::Add(const es_format_t *fmt)

modules/stream_out/sdi/SDIStream.cpp

@@ -237,7 +237,6 @@ AbstractDecodedStream::~AbstractDecodedStream()
     deinit();
     es_format_Clean(&requestedoutput);
     vlc_cond_destroy(&inputWait);
-    vlc_mutex_destroy(&inputLock);
 }
 
 void AbstractDecodedStream::deinit()

modules/stream_out/transcode/encoder/encoder.c

@@ -50,7 +50,6 @@ void transcode_encoder_delete( transcode_encoder_t *p_enc )
         {
             block_ChainRelease( p_enc->p_buffers );
             picture_fifo_Delete( p_enc->pp_pics );
-            vlc_mutex_destroy( &p_enc->lock_out );
         }
         es_format_Clean( &p_enc->p_encoder->fmt_in );
         es_format_Clean( &p_enc->p_encoder->fmt_out );

modules/stream_out/transcode/transcode.c

@@ -494,18 +494,12 @@ static void Close( vlc_object_t * p_this )
 
     transcode_encoder_config_clean( &p_sys->senc_cfg );
 
-    vlc_mutex_destroy( &p_sys->lock );
-
     free( p_sys );
 }
 
 static void DeleteSoutStreamID( sout_stream_id_sys_t *id )
 {
-    if( id )
-    {
-        vlc_mutex_destroy(&id->fifo.lock);
-        free( id );
-    }
+    free( id );
 }
 
 static void SendSpuToVideoCallback( void *cbdata, subpicture_t *p_subpicture )

modules/video_filter/alphamask.c

@@ -135,7 +135,6 @@ static void Destroy( vlc_object_t *p_this )
     var_DelCallback( p_filter, CFG_PREFIX "mask", MaskCallback,
                      p_filter );
 
-    vlc_mutex_destroy( &p_sys->mask_lock );
     if( p_sys->p_mask )
         picture_Release( p_sys->p_mask );
 

modules/video_filter/ball.c

@@ -332,8 +332,6 @@ static void Destroy( vlc_object_t *p_this )
     var_DelCallback( p_filter, FILTER_PREFIX "edge-visible",
                      ballCallback, p_sys );
 
-    vlc_mutex_destroy( &p_sys->lock );
-
     image_HandlerDelete( p_sys->p_image );
 
     free( p_sys->p_smooth );

modules/video_filter/bluescreen.c

@@ -159,7 +159,6 @@ static void Destroy( vlc_object_t *p_this )
     var_DelCallback( p_filter, CFG_PREFIX "vt", BluescreenCallback, p_sys );
 
     free( p_sys->p_at );
-    vlc_mutex_destroy( &p_sys->lock );
     free( p_sys );
 }