Imported Debian version 2.5.0~trusty1.1

[deb_ffmpeg.git] / ffmpeg / libavformat / network.h

diff --git a/ffmpeg/libavformat/network.h b/ffmpeg/libavformat/network.h
index d89a62daa3517df7adee476371fc830140b9864c..0d1081ad1fdb706ae7ef35385dcdfe6494b69ebf 100644 (file)
--- a/ffmpeg/libavformat/network.h
+++ b/ffmpeg/libavformat/network.h
@@ -111,6 +111,14 @@ struct sockaddr_storage {
 };
 #endif /* !HAVE_STRUCT_SOCKADDR_STORAGE */
 
+typedef union sockaddr_union {
+    struct sockaddr_storage storage;
+    struct sockaddr_in in;
+#if HAVE_STRUCT_SOCKADDR_IN6
+    struct sockaddr_in6 in6;
+#endif
+} sockaddr_union;
+
 #ifndef MSG_NOSIGNAL
 #define MSG_NOSIGNAL 0
 #endif