avdevice/alldevices: make avdevice_register_all thread safe

use ff_thread_once

Muhammad Faiz committed 9 years ago

Commit 776f2891 parent af7010a2 files · +9 −8Browse files

Unified · Split

2 files

  */
 #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);
     REGISTER_INDEV   (LIBCDIO,          libcdio);
     REGISTER_INDEV   (LIBDC1394,        libdc1394);
 }
+void avdevice_register_all(void)
+{
+    AVOnce control = AV_ONCE_INIT;
+    ff_thread_once(&control, register_all);
+}

@@ -67,7 +67,6 @@ const char *avdevice_license(void); · 66 unmodified lines
67		67
68	/**	68	/**
69	* Initialize libavdevice and register all the input and output devices.	69	* Initialize libavdevice and register all the input and output devices.
70	* @warning This function is not thread safe.
71	*/	70	*/
72	void avdevice_register_all(void);	71	void avdevice_register_all(void);
73		72

Keyboard shortcuts