From 3d7b42f97b40b398819cbc03944cf4dab16dafad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 20 Jan 2010 17:26:14 +0000
Subject: [PATCH] =?UTF-8?q?Use=20the=20configure=20check=20from=20r21351?=
 =?UTF-8?q?=20and=20use=20it=20to=20properly=20define=20struct=20sockaddr?=
 =?UTF-8?q?=20(in=20case=20it's=20not=20missing)=20so=20it=20always=20work?=
 =?UTF-8?q?s=20on=20the=20system=20that=20we=20are=20defining=20it=20for,?=
 =?UTF-8?q?=20in=20a=20RFC-2553/3493-compliant=20way=20(i.e.=20containing?=
 =?UTF-8?q?=20a=20ss=5Ffamily=20field).=20which=20is=20used=20in=20udp.c.?=
 =?UTF-8?q?=20Patch=20by=20Martin=20Storsj=C3=B6=20<$firstname=20$firstnam?=
 =?UTF-8?q?e=20st>.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Originally committed as revision 21352 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
 libavformat/network.h | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/libavformat/network.h b/libavformat/network.h
index ea8e946701..6e82f81ca8 100644
--- a/libavformat/network.h
+++ b/libavformat/network.h
@@ -70,7 +70,15 @@ int inet_aton (const char * str, struct in_addr * add);
 
 #if !HAVE_STRUCT_SOCKADDR_STORAGE
 struct sockaddr_storage {
-    struct sockaddr_in x;
+#if HAVE_STRUCT_SOCKADDR_SA_LEN
+    uint8_t ss_len;
+    uint8_t ss_family;
+#else
+    uint16_t ss_family;
+#endif
+    char ss_pad1[6];
+    int64_t ss_align;
+    char ss_pad2[112];
 };
 #endif