More ID3v1 genres from ffmbc.

[ffmpeg] / libavformat / network.h

diff --git a/libavformat/network.h b/libavformat/network.h
index 37606ee98df2bebf987b9935610505f874a75b39..7af77991d4d648ec75012ed564d547d8cc31ce44 100644 (file)
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007 The FFmpeg Project.
+ * Copyright (c) 2007 The FFmpeg Project
  *
  * This file is part of FFmpeg.
  *
@@ -18,10 +18,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#ifndef NETWORK_H
-#define NETWORK_H
+#ifndef AVFORMAT_NETWORK_H
+#define AVFORMAT_NETWORK_H
 
-#ifdef HAVE_WINSOCK2_H
+#include "config.h"
+
+#if HAVE_WINSOCK2_H
 #include <winsock2.h>
 #include <ws2tcpip.h>
 
@@ -38,15 +40,32 @@
 #define FF_NETERROR(err) err
 #endif
 
-#ifdef HAVE_ARPA_INET_H
+#if HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
 
 int ff_socket_nonblock(int socket, int enable);
 
-#if !defined(HAVE_INET_ATON)
+static inline int ff_network_init(void)
+{
+#if HAVE_WINSOCK2_H
+    WSADATA wsaData;
+    if (WSAStartup(MAKEWORD(1,1), &wsaData))
+        return 0;
+#endif
+    return 1;
+}
+
+static inline void ff_network_close(void)
+{
+#if HAVE_WINSOCK2_H
+    WSACleanup();
+#endif
+}
+
+#if !HAVE_INET_ATON
 /* in os_support.c */
 int inet_aton (const char * str, struct in_addr * add);
 #endif
 
-#endif
+#endif /* AVFORMAT_NETWORK_H */