diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-15 11:29:02 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-15 11:34:30 +0200 |
| commit | 2c959eccc69cca1a5b83d643d01271df2b280bb5 (patch) | |
| tree | 6c63ab0822727cfc9864788fcb1e201018a329bb | |
| parent | bfbe07670bb0d0d902c03953d44f9482709696ee (diff) | |
| parent | c3386bd5b4d3662f94e902a0fe3e9e869e29967d (diff) | |
| download | ffmpeg-2c959eccc69cca1a5b83d643d01271df2b280bb5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
rtpproto: Check for the right feature when reading a sockaddr_in6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/rtpproto.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index 85300a6eb7..64182dd40a 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 |