virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avformat: Initialize gnutls in ff_tls_init()

Browse Source 
Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
Martin Storsjö
2011-02-06 00:06:49 +01:00
parent 8148631269
commit 1606e551ff
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
libavformat/network.c
View File

@@ -53,6 +53,16 @@ static unsigned long openssl_thread_id(void)
#endif #endif
#endif #endif
#endif #endif
#if CONFIG_GNUTLS
#include <gnutls/gnutls.h>
#if THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
#include <gcrypt.h>
#include <errno.h>
#undef malloc
#undef free
GCRY_THREAD_OPTION_PTHREAD_IMPL;
#endif
#endif
void ff_tls_init(void) void ff_tls_init(void)
{ {
@@ -75,6 +85,13 @@ void ff_tls_init(void)
#endif #endif
} }
openssl_init++; openssl_init++;
#endif
#if CONFIG_GNUTLS
#if 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();
#endif #endif
avpriv_unlock_avformat(); avpriv_unlock_avformat();
} }
@@ -95,6 +112,9 @@ void ff_tls_deinit(void)
} }
#endif #endif
} }
#endif
#if CONFIG_GNUTLS
gnutls_global_deinit();
#endif #endif
avpriv_unlock_avformat(); avpriv_unlock_avformat();
} }