har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  rtpproto: Check for the right feature when reading a sockaddr_in6

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-08-15 11:29:02 +02:00
commit 2c959eccc6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/rtpproto.c
View File

@ -132,7 +132,7 @@ static int get_port(const struct sockaddr_storage *ss)
{ {
if (ss->ss_family == AF_INET) if (ss->ss_family == AF_INET)
return ntohs(((const struct sockaddr_in *)ss)->sin_port); return ntohs(((const struct sockaddr_in *)ss)->sin_port);
#ifdef AF_INET6 #if HAVE_STRUCT_SOCKADDR_IN6
if (ss->ss_family == AF_INET6) if (ss->ss_family == AF_INET6)
return ntohs(((const struct sockaddr_in6 *)ss)->sin6_port); return ntohs(((const struct sockaddr_in6 *)ss)->sin6_port);
#endif #endif
@ -143,7 +143,7 @@ static void set_port(struct sockaddr_storage *ss, int port)
{ {
if (ss->ss_family == AF_INET) if (ss->ss_family == AF_INET)
((struct sockaddr_in *)ss)->sin_port = htons(port); ((struct sockaddr_in *)ss)->sin_port = htons(port);
#ifdef AF_INET6 #if HAVE_STRUCT_SOCKADDR_IN6
else if (ss->ss_family == AF_INET6) else if (ss->ss_family == AF_INET6)
((struct sockaddr_in6 *)ss)->sin6_port = htons(port); ((struct sockaddr_in6 *)ss)->sin6_port = htons(port);
#endif #endif