diff options
| author | Muhammad Faiz <mfcc64@gmail.com> | 2017-03-07 15:55:38 +0700 |
|---|---|---|
| committer | Muhammad Faiz <mfcc64@gmail.com> | 2017-03-07 20:34:44 +0700 |
| commit | 776f289c0fe82c4e3418a7c504ae3247eb10ffd7 (patch) | |
| tree | 6753811c8665fb01b8c921c29deeedca86ba4a2a | |
| parent | af7010ad0557fe66d35886581eecebf02e92637c (diff) | |
| download | ffmpeg-776f289c0fe82c4e3418a7c504ae3247eb10ffd7.tar.gz | |
avdevice/alldevices: make avdevice_register_all thread safe
use ff_thread_once
Suggested-by: wm4 <nfxjfg@googlemail.com>
Signed-off-by: Muhammad Faiz <mfcc64@gmail.com>
| -rw-r--r-- | libavdevice/alldevices.c | 16 | ||||
| -rw-r--r-- | libavdevice/avdevice.h | 1 |
2 files changed, 9 insertions, 8 deletions
diff --git a/libavdevice/alldevices.c b/libavdevice/alldevices.c index a761be4f9c..75f4ae0428 100644 --- a/libavdevice/alldevices.c +++ b/libavdevice/alldevices.c @@ -19,6 +19,7 @@ */ #include "config.h" +#include "libavutil/thread.h" #include "avdevice.h" #define REGISTER_OUTDEV(X, x) \ @@ -37,14 +38,8 @@ #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); +} diff --git a/libavdevice/avdevice.h b/libavdevice/avdevice.h index 6153f2cd46..84f374a6f8 100644 --- a/libavdevice/avdevice.h +++ b/libavdevice/avdevice.h @@ -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); |