diff options
| author | Diego Biurrun <diego@biurrun.de> | 2016-11-23 16:42:00 +0100 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2016-11-25 18:46:53 +0100 |
| commit | e122b12c88487ac8766ff4eb071856b0666f0134 (patch) | |
| tree | 86b90ad795786a71da458d74c0a5c35dcb615c16 /libavformat/tls_gnutls.c | |
| parent | bf2f748fc74fff5272075e1fe1c07b4152421526 (diff) | |
| download | ffmpeg-e122b12c88487ac8766ff4eb071856b0666f0134.tar.gz | |
build: Drop gcrypt support
GnuTLS in combination with gcrypt has been deprecated since 2010.
Diffstat (limited to 'libavformat/tls_gnutls.c')
| -rw-r--r-- | libavformat/tls_gnutls.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index 3e29a45ce4..f8a612ad9b 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -35,12 +35,6 @@ #include "libavutil/opt.h" #include "libavutil/parseutils.h" -#if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00 -#include <gcrypt.h> -#include "libavutil/thread.h" -GCRY_THREAD_OPTION_PTHREAD_IMPL; -#endif - typedef struct TLSContext { const AVClass *class; TLSShared tls_shared; @@ -52,10 +46,6 @@ typedef struct TLSContext { void ff_gnutls_init(void) { avpriv_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(); } |