diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 21:20:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-05-28 21:21:07 +0200 |
| commit | f0b99112e3570e10409cdc35e86dd431fad1546b (patch) | |
| tree | 91e132bc756f2400266b5c07ff79a70d96b38a49 /libavformat | |
| parent | 5c4160809698bf3731812d22ca8bf6c3754ff189 (diff) | |
| parent | d4d90504a687d2c0ef77ccf11d831f24dcff9cf1 (diff) | |
| download | ffmpeg-f0b99112e3570e10409cdc35e86dd431fad1546b.tar.gz | |
Merge commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1'
* commit 'd4d90504a687d2c0ef77ccf11d831f24dcff9cf1':
tls_gnutls: Add missing includes for the gcrypt thread safety callbacks
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/tls_gnutls.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/tls_gnutls.c b/libavformat/tls_gnutls.c index b846bc4469..942ece97ed 100644 --- a/libavformat/tls_gnutls.c +++ b/libavformat/tls_gnutls.c @@ -37,6 +37,7 @@ #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00 #include <gcrypt.h> +#include "libavutil/thread.h" GCRY_THREAD_OPTION_PTHREAD_IMPL; #endif |