diff options
| author | Vivekanand <sendtovivekanand@gmail.com> | 2016-04-07 16:16:23 +0530 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-06-05 23:48:12 +0200 |
| commit | b092ee701f4d0ef2b8a4171cd38101d1ee9a1034 (patch) | |
| tree | 06c9f13dfbc0866c92746822f28891f3fc43fee8 | |
| parent | f730367a60e343f293a997d8ee43aed8c68a6364 (diff) | |
| download | ffmpeg-b092ee701f4d0ef2b8a4171cd38101d1ee9a1034.tar.gz | |
avformat/allformats: Making av_register_all() thread-safe.
When multiple threads tries to call av_register_all(), the first thread sets
initialized to 1 and do the register process. At the same time, other thread might
also call av_register_all(), which returns immediately because initialized is set to 1
(even when it has not completed registering codecs). We can avoid this problem
if we set initialised to 1 while exiting from function.
Github: Closes #196
| -rw-r--r-- | libavformat/allformats.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index 0a38793289..ddf540ca03 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -47,7 +47,6 @@ void av_register_all(void) if (initialized) return; - initialized = 1; avcodec_register_all(); @@ -371,4 +370,6 @@ void av_register_all(void) REGISTER_DEMUXER (LIBGME, libgme); REGISTER_DEMUXER (LIBMODPLUG, libmodplug); REGISTER_MUXDEMUX(LIBNUT, libnut); + + initialized = 1; } |