virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

Merge commit '3357bccc5cb31795f248cd72dc480025f3075a5b'

Browse Source 
* commit '3357bccc5cb31795f248cd72dc480025f3075a5b':
  udp: Allow specifying multicast include/blocks as host names as well

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-07-30 11:31:08 +02:00
commit 15ca3ab825
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/udp.c
View File

@ -237,7 +237,7 @@ static int udp_set_multicast_sources(int sockfd, struct sockaddr *addr,
int level = addr->sa_family == AF_INET ? IPPROTO_IP : IPPROTO_IPV6; int level = addr->sa_family == AF_INET ? IPPROTO_IP : IPPROTO_IPV6;
struct addrinfo *sourceaddr = udp_resolve_host(sources[i], 0, struct addrinfo *sourceaddr = udp_resolve_host(sources[i], 0,
SOCK_DGRAM, AF_UNSPEC, SOCK_DGRAM, AF_UNSPEC,
AI_NUMERICHOST); 0);
if (!sourceaddr) if (!sourceaddr)
return AVERROR(ENOENT); return AVERROR(ENOENT);
@ -267,7 +267,7 @@ static int udp_set_multicast_sources(int sockfd, struct sockaddr *addr,
struct ip_mreq_source mreqs; struct ip_mreq_source mreqs;
struct addrinfo *sourceaddr = udp_resolve_host(sources[i], 0, struct addrinfo *sourceaddr = udp_resolve_host(sources[i], 0,
SOCK_DGRAM, AF_UNSPEC, SOCK_DGRAM, AF_UNSPEC,
AI_NUMERICHOST); 0);
if (!sourceaddr) if (!sourceaddr)
return AVERROR(ENOENT); return AVERROR(ENOENT);
if (sourceaddr->ai_addr->sa_family != AF_INET) { if (sourceaddr->ai_addr->sa_family != AF_INET) {