[FFmpeg-cvslog] avformat/tls: Fix windows build with openSSL enabled.

Matt Oliver git at videolan.org
Thu Jan 23 14:34:26 CET 2014


ffmpeg | branch: master | Matt Oliver <protogonoi at gmail.com> | Mon Jan 20 23:13:51 2014 +1100| [306e1ac012d00f1ac9a8c9547a5c72b052de2dd4] | committer: Michael Niedermayer

avformat/tls: Fix windows build with openSSL enabled.

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

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

 libavformat/tls.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavformat/tls.c b/libavformat/tls.c
index 5da82db7..7fd18cf 100644
--- 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



More information about the ffmpeg-cvslog mailing list