[FFmpeg-cvslog] avformat: Initialize gnutls in ff_tls_init()

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Sun Feb  6 00:06:49 2011 +0100| [1606e551ff4ace23da8a372ebb1147da36566372] | committer: Martin Storsjö

avformat: Initialize gnutls in ff_tls_init()

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1606e551ff4ace23da8a372ebb1147da36566372
---

 libavformat/network.c |   20 ++++++++++++++++++++
 1 files changed, 20 insertions(+), 0 deletions(-)

diff --git a/libavformat/network.c b/libavformat/network.c
index 6ef609f..d50e1e7 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -53,6 +53,16 @@ static unsigned long openssl_thread_id(void)
 #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)
 {
@@ -76,6 +86,13 @@ void ff_tls_init(void)
     }
     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
     avpriv_unlock_avformat();
 }
 
@@ -96,6 +113,9 @@ void ff_tls_deinit(void)
 #endif
     }
 #endif
+#if CONFIG_GNUTLS
+    gnutls_global_deinit();
+#endif
     avpriv_unlock_avformat();
 }