Merge commit 'dcc7e4bf1d0913123bfafbc58bf47bd41dd5848d'

[ffmpeg] / libavformat / tls.c

diff --git a/libavformat/tls.c b/libavformat/tls.c
index 5da82db7967b86c423d2bfb2045b13623f53143a..7fd18cfce0c3946103ca228570b137e054bfbddb 100644 (file)
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -24,6 +24,9 @@
 #include "libavutil/avstring.h"
 #include "libavutil/opt.h"
 #include "libavutil/parseutils.h"
+#include "network.h"
+#include "os_support.h"
+#include "internal.h"
 #if CONFIG_GNUTLS
 #include <gnutls/gnutls.h>
 #include <gnutls/x509.h>
@@ -50,9 +53,6 @@
             SSL_CTX_free(c->ctx); \
     } while (0)
 #endif
-#include "network.h"
-#include "os_support.h"
-#include "internal.h"
 #if HAVE_POLL_H
 #include <poll.h>
 #endif