Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / network.c

diff --git a/libavformat/network.c b/libavformat/network.c
index e27c64d3c07a2ab1cd044c11a37cae49b59fc052..9beaaaf35087b8b0037d3f8cf99b1d5b8ad91f16 100644 (file)
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -124,13 +124,16 @@ int ff_network_inited_globally;
 
 int ff_network_init(void)
 {
+#if HAVE_WINSOCK2_H
+    WSADATA wsaData;
+#endif
+
     if (!ff_network_inited_globally)
         av_log(NULL, AV_LOG_WARNING, "Using network protocols without global "
                                      "network initialization. Please use "
                                      "avformat_network_init(), this will "
                                      "become mandatory later.\n");
 #if HAVE_WINSOCK2_H
-    WSADATA wsaData;
     if (WSAStartup(MAKEWORD(1,1), &wsaData))
         return 0;
 #endif