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_gnutls.c | |
| parent | e24f192a9fd6013e272df1bfaeaba31e8ca49f92 (diff) | |
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_gnutls.c')
| -rw-r--r-- | libavformat/tls_gnutls.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index 0cef9575ec..e3c43683be 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -55,20 +55,20 @@ typedef struct TLSContext { void ff_gnutls_init(void) { - avpriv_lock_avformat(); + ff_lock_avformat(); #if HAVE_THREADS && GNUTLS_VERSION_NUMBER < 0x020b00 if (gcry_control(GCRYCTL_ANY_INITIALIZATION_P) == 0) gcry_control(GCRYCTL_SET_THREAD_CBS, &gcry_threads_pthread); #endif gnutls_global_init(); - avpriv_unlock_avformat(); + ff_unlock_avformat(); } void ff_gnutls_deinit(void) { - avpriv_lock_avformat(); + ff_lock_avformat(); gnutls_global_deinit(); - avpriv_unlock_avformat(); + ff_unlock_avformat(); } static int print_tls_error(URLContext *h, int ret) |