diff options
| author | wm4 <nfxjfg@googlemail.com> | 2017-12-21 22:54:06 +0100 |
|---|---|---|
| committer | wm4 <nfxjfg@googlemail.com> | 2017-12-26 02:50:00 +0100 |
| commit | 86a13bf2ffb40d44260d5747a4782a42a43a1ed8 (patch) | |
| tree | cb6310c0db5956b5c8567cd9e99e6c2799ce90e0 /libavformat/tls_openssl.c | |
| parent | e24f192a9fd6013e272df1bfaeaba31e8ca49f92 (diff) | |
| download | ffmpeg-86a13bf2ffb40d44260d5747a4782a42a43a1ed8.tar.gz | |
lavc, lavf: move avformat static mutex from avcodec to avformat
It's completely absurd that libavcodec would care about libavformat
locking, but it was there because the lock manager was in libavcodec.
This is more stright forward. Changes ABI, but we don't require ABI
compatibility currently.
Diffstat (limited to 'libavformat/tls_openssl.c')
| -rw-r--r-- | libavformat/tls_openssl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/tls_openssl.c b/libavformat/tls_openssl.c index 1443e9025a..59a86150a7 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) |