Use static mutexes

[vlc] / modules / codec / avcodec / audio.c

diff --git a/modules/codec/avcodec/audio.c b/modules/codec/avcodec/audio.c
index 708e193f8f0e0d203fabbc1146ee1cf7fd43c31c..92c62080259b61ac3fd24af05cb5bc8f59f11787 100644 (file)
--- a/modules/codec/avcodec/audio.c
+++ b/modules/codec/avcodec/audio.c
@@ -180,23 +180,17 @@ int InitAudioDec( decoder_t *p_dec, AVCodecContext *p_context,
     }
 
     /* ***** Open the codec ***** */
-    vlc_mutex_t *lock = var_AcquireMutex( "avcodec" );
-    if( lock == NULL )
-    {
-        free( p_sys->p_context->extradata );
-        free( p_sys );
-        return VLC_ENOMEM;
-    }
+    vlc_mutex_lock( &avcodec_lock );
 
     if (avcodec_open( p_sys->p_context, p_sys->p_codec ) < 0)
     {
-        vlc_mutex_unlock( lock );
+        vlc_mutex_unlock( &avcodec_lock );
         msg_Err( p_dec, "cannot open codec (%s)", p_sys->psz_namecodec );
         free( p_sys->p_context->extradata );
         free( p_sys );
         return VLC_EGENERIC;
     }
-    vlc_mutex_unlock( lock );
+    vlc_mutex_unlock( &avcodec_lock );
 
     msg_Dbg( p_dec, "ffmpeg codec (%s) started", p_sys->psz_namecodec );