avdevice/alldevices: make avdevice_register_all thread safe
authorMuhammad Faiz <mfcc64@gmail.com>
Tue, 7 Mar 2017 08:55:38 +0000 (15:55 +0700)
committerMuhammad Faiz <mfcc64@gmail.com>
Tue, 7 Mar 2017 13:34:44 +0000 (20:34 +0700)
use ff_thread_once

Suggested-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
libavdevice/alldevices.c
libavdevice/avdevice.h

index a761be4..75f4ae0 100644 (file)
@@ -19,6 +19,7 @@
  */
 
 #include "config.h"
+#include "libavutil/thread.h"
 #include "avdevice.h"
 
 #define REGISTER_OUTDEV(X, x)                                           \
 
 #define REGISTER_INOUTDEV(X, x) REGISTER_OUTDEV(X, x); REGISTER_INDEV(X, x)
 
-void avdevice_register_all(void)
+static void register_all(void)
 {
-    static int initialized;
-
-    if (initialized)
-        return;
-    initialized = 1;
-
     /* devices */
     REGISTER_INOUTDEV(ALSA,             alsa);
     REGISTER_INDEV   (AVFOUNDATION,     avfoundation);
@@ -76,3 +71,10 @@ void avdevice_register_all(void)
     REGISTER_INDEV   (LIBCDIO,          libcdio);
     REGISTER_INDEV   (LIBDC1394,        libdc1394);
 }
+
+void avdevice_register_all(void)
+{
+    AVOnce control = AV_ONCE_INIT;
+
+    ff_thread_once(&control, register_all);
+}
index 6153f2c..84f374a 100644 (file)
@@ -67,7 +67,6 @@ const char *avdevice_license(void);
 
 /**
  * Initialize libavdevice and register all the input and output devices.
- * @warning This function is not thread safe.
  */
 void avdevice_register_all(void);