[FFmpeg-cvslog] network: properly declare WSADATA in windows

Sergey Radionov git at videolan.org
Thu Dec 22 02:05:02 CET 2011


ffmpeg | branch: master | Sergey Radionov <RSATom at gmail.com> | Wed Dec 21 09:19:10 2011 +0700| [139cef8e29bd14de66e29e37722fb09ab2b7e9c5] | committer: Luca Barbato

network: properly declare WSADATA in windows

Fixed "ISO C90 forbids mixed declarations and code" in ff_network_init

Signed-off-by: Luca Barbato <lu_zero at gentoo.org>

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

 libavformat/network.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/libavformat/network.c b/libavformat/network.c
index f8403ae..bfc34c7 100644
--- a/libavformat/network.c
+++ b/libavformat/network.c
@@ -123,13 +123,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



More information about the ffmpeg-cvslog mailing list