X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Fnetwork.c;h=e9eab297e2d453c4bcb4e2da66c38bb5566a81e9;hb=e3f71423068b9b8ffa9ebc69ae566e018f48cadf;hp=9f02ec6c514426d1172a5fbbf60f24520ead3459;hpb=4e40e6128769246ee101e1990be42880a07dda18;p=ffmpeg

diff --git a/libavformat/network.c b/libavformat/network.c
index 9f02ec6c514..e9eab297e2d 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -66,7 +66,7 @@ GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif
 #endif
 
-void ff_tls_init(void)
+int ff_tls_init(void)
 {
     avpriv_lock_avformat();
 #if CONFIG_OPENSSL
@@ -77,6 +77,8 @@ void ff_tls_init(void)
         if (!CRYPTO_get_locking_callback()) {
             int i;
             openssl_mutexes = av_malloc_array(sizeof(pthread_mutex_t), CRYPTO_num_locks());
+            if (!openssl_mutexes)
+                return AVERROR(ENOMEM);
             for (i = 0; i < CRYPTO_num_locks(); i++)
                 pthread_mutex_init(&openssl_mutexes[i], NULL);
             CRYPTO_set_locking_callback(openssl_lock);
@@ -96,6 +98,8 @@ void ff_tls_init(void)
     gnutls_global_init();
 #endif
     avpriv_unlock_avformat();
+
+    return 0;
 }
 
 void ff_tls_deinit(void)