X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavformat%2Ftls_openssl.c;h=59a86150a793dbc18c34f56578f6839c8fd7fb1a;hb=c86490c49a3d0683b2f63338430a369c174e2bd5;hp=1443e9025aa8326b8a772f749aa888c440378064;hpb=b212eff773b860d6f7da0f29d49947bd384f718f;p=ffmpeg diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 1443e9025aa..59a86150a79 100644 --- a/libavformat/tls_openssl.c +++ b/libavformat/tls_openssl.c @@ -68,7 +68,7 @@ static unsigned long openssl_thread_id(void) int ff_openssl_init(void) { - avpriv_lock_avformat(); + ff_lock_avformat(); if (!openssl_init) { SSL_library_init(); SSL_load_error_strings(); @@ -77,7 +77,7 @@ int ff_openssl_init(void) int i; openssl_mutexes = av_malloc_array(sizeof(pthread_mutex_t), CRYPTO_num_locks()); if (!openssl_mutexes) { - avpriv_unlock_avformat(); + ff_unlock_avformat(); return AVERROR(ENOMEM); } @@ -91,14 +91,14 @@ int ff_openssl_init(void) #endif } openssl_init++; - avpriv_unlock_avformat(); + ff_unlock_avformat(); return 0; } void ff_openssl_deinit(void) { - avpriv_lock_avformat(); + ff_lock_avformat(); openssl_init--; if (!openssl_init) { #if HAVE_THREADS @@ -111,7 +111,7 @@ void ff_openssl_deinit(void) } #endif } - avpriv_unlock_avformat(); + ff_unlock_avformat(); } static int print_tls_error(URLContext *h, int ret)