avcodec: use vlc_global_mutex

diff --git a/include/vlc_avcodec.h b/include/vlc_avcodec.h
index fc5a3a99bd3215043a5b293cb612d8ae97fd1ef2..fd3d2e6b258dfc611cbf7d1c1eb6322bd210a8fd 100644 (file)
--- a/include/vlc_avcodec.h
+++ b/include/vlc_avcodec.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vlc_avcodec.h: VLC thread support for FFMPEG/libavcodec
  *****************************************************************************
- * Copyright (C) 2009 Rémi Denis-Courmont
+ * Copyright (C) 2009-2010 Rémi Denis-Courmont
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -21,16 +21,14 @@
 #ifndef VLC_AVCODEC_H
 # define VLC_AVCODEC_H 1
 
-VLC_EXPORT( void, vlc_avcodec_mutex, (bool) );
-
 static inline void vlc_avcodec_lock (void)
 {
-    vlc_avcodec_mutex (true);
+    vlc_global_lock (VLC_AVCODEC_MUTEX);
 }
 
 static inline void vlc_avcodec_unlock (void)
 {
-    vlc_avcodec_mutex (false);
+    vlc_global_unlock (VLC_AVCODEC_MUTEX);
 }
 
 #endif

diff --git a/src/libvlc.c b/src/libvlc.c
index 9affe8cf374ac61a60a500dc0214ed6222a5706a..efd4952445624efa3436cd354c03e98b3b4df537 100644 (file)
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -1967,15 +1967,3 @@ static int ConsoleWidth( void )
 
     return i_width;
 }
-
-#include <vlc_avcodec.h>
-
-void vlc_avcodec_mutex (bool acquire)
-{
-    static vlc_mutex_t lock = VLC_STATIC_MUTEX;
-
-    if (acquire)
-        vlc_mutex_lock (&lock);
-    else
-        vlc_mutex_unlock (&lock);
-}

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index bb3ad12710834d78b456b2b08b61f62dd1f79c36..2ea18f9395672767bbc786c1df35f45778d2b46c 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -473,7 +473,6 @@ video_format_Setup
 video_format_Print
 video_splitter_Delete
 video_splitter_New
-vlc_avcodec_mutex
 vlc_b64_decode
 vlc_b64_decode_binary
 vlc_b64_decode_binary_to_buffer