diff options
| author | Vivekanand <sendtovivekanand@gmail.com> | 2016-04-07 16:16:23 +0530 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2016-08-13 13:08:57 +0200 |
| commit | f3c1a76ffdd8283e7e0634b2daf9683047558d1e (patch) | |
| tree | 45780449ab254a81aa314e239c8ef232883662fa | |
| parent | b62191f9c1892d922811931fddbb5d81eeac857e (diff) | |
| download | android_external_ffmpeg-f3c1a76ffdd8283e7e0634b2daf9683047558d1e.tar.gz android_external_ffmpeg-f3c1a76ffdd8283e7e0634b2daf9683047558d1e.tar.bz2 android_external_ffmpeg-f3c1a76ffdd8283e7e0634b2daf9683047558d1e.zip | |
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
(cherry picked from commit b092ee701f4d0ef2b8a4171cd38101d1ee9a1034)
Conflicts:
libavformat/allformats.c
| -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 02bb16a71e..fb1a67797b 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -54,7 +54,6 @@ void av_register_all(void) if (initialized) return; - initialized = 1; avcodec_register_all(); @@ -418,4 +417,6 @@ void av_register_all(void) REGISTER_PROTOCOL(LIBRTMPTE, librtmpte); REGISTER_PROTOCOL(LIBSSH, libssh); REGISTER_PROTOCOL(LIBSMBCLIENT, libsmbclient); + + initialized = 1; } |