[FFmpeg-cvslog] rtpproto: Check for the right feature when reading a sockaddr_in6

Dave Yeo git at videolan.org
Thu Aug 15 11:34:59 CEST 2013


ffmpeg | branch: master | Dave Yeo <dave.r.yeo at gmail.com> | Wed Aug 14 15:22:13 2013 -0700| [c3386bd5b4d3662f94e902a0fe3e9e869e29967d] | committer: Martin Storsjö

rtpproto: Check for the right feature when reading a sockaddr_in6

Some systems, such as OS/2, define AF_INET6 without a full
implementation.

Signed-off-by: Martin Storsjö <martin at martin.st>

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

 libavformat/rtpproto.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c
index 6fa3182..4cc69fb 100644
--- a/libavformat/rtpproto.c
+++ b/libavformat/rtpproto.c
@@ -132,7 +132,7 @@ static int get_port(const struct sockaddr_storage *ss)
 {
     if (ss->ss_family == AF_INET)
         return ntohs(((const struct sockaddr_in *)ss)->sin_port);
-#ifdef AF_INET6
+#if HAVE_STRUCT_SOCKADDR_IN6
     if (ss->ss_family == AF_INET6)
         return ntohs(((const struct sockaddr_in6 *)ss)->sin6_port);
 #endif
@@ -143,7 +143,7 @@ static void set_port(struct sockaddr_storage *ss, int port)
 {
     if (ss->ss_family == AF_INET)
         ((struct sockaddr_in *)ss)->sin_port = htons(port);
-#ifdef AF_INET6
+#if HAVE_STRUCT_SOCKADDR_IN6
     else if (ss->ss_family == AF_INET6)
         ((struct sockaddr_in6 *)ss)->sin6_port = htons(port);
 #endif



More information about the ffmpeg-cvslog mailing list