diff options
| author | Muhammad Faiz <mfcc64@gmail.com> | 2017-03-07 15:53:27 +0700 |
|---|---|---|
| committer | Muhammad Faiz <mfcc64@gmail.com> | 2017-03-07 20:34:44 +0700 |
| commit | 49635f0a46365f361ce665356bb41e199176021b (patch) | |
| tree | 8fd886082e4ba910bd5e482e8b4a34ab0e2d48b1 | |
| parent | e85e8408802dc3a474e6a610867df8e57c768339 (diff) | |
| download | ffmpeg-49635f0a46365f361ce665356bb41e199176021b.tar.gz | |
avfilter/allformats: make av_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-- | libavformat/allformats.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 35869e3cf0..132e58b8b9 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -19,6 +19,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/thread.h" #include "avformat.h" #include "rtp.h" #include "rdt.h" @@ -41,13 +42,8 @@ #define REGISTER_MUXDEMUX(X, x) REGISTER_MUXER(X, x); REGISTER_DEMUXER(X, x) -void av_register_all(void) +static void register_all(void) { - static int initialized; - - if (initialized) - return; - avcodec_register_all(); /* (de)muxers */ @@ -383,6 +379,11 @@ void av_register_all(void) REGISTER_DEMUXER (LIBMODPLUG, libmodplug); REGISTER_MUXDEMUX(LIBNUT, libnut); REGISTER_DEMUXER (LIBOPENMPT, libopenmpt); +} + +void av_register_all(void) +{ + AVOnce control = AV_ONCE_INIT; - initialized = 1; + ff_thread_once(&control, register_all); } |