Merge commit 'bd255f9feb4deea4c990e582f0ba3b90d7b64b4c'

[ffmpeg] / libavformat / network.c

diff --git a/libavformat/network.c b/libavformat/network.c
index 6e924bed66b7c09b3c82a65b9e85e6a747db55f2..64bd0ed9ed9a3776aeb8556ad1e9622c10619a4c 100644 (file)
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -60,8 +60,6 @@ static unsigned long openssl_thread_id(void)
 #if HAVE_THREADS && GNUTLS_VERSION_NUMBER <= 0x020b00
 #include <gcrypt.h>
 #include <errno.h>
-#undef malloc
-#undef free
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 #endif
 #endif