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

Remove some ifdefs by using the "dest_addr_len" field in both the IPv4-only

Browse Source 
code and the protocol-independent code

Originally committed as revision 11011 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Luca Abeni
2007-11-14 07:35:36 +00:00
parent 0d4e281cac
commit 0ec1233511
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavformat/udp.c
View File

@@ -38,8 +38,8 @@ typedef struct {
struct sockaddr_in dest_addr; struct sockaddr_in dest_addr;
#else #else
struct sockaddr_storage dest_addr; struct sockaddr_storage dest_addr;
size_t dest_addr_len;
#endif #endif
size_t dest_addr_len;
} UDPContext; } UDPContext;
#define UDP_TX_BUF_SIZE 32768 #define UDP_TX_BUF_SIZE 32768
@@ -234,6 +234,7 @@ int udp_set_remote_url(URLContext *h, const char *uri)
return AVERROR(EIO); return AVERROR(EIO);
s->dest_addr.sin_family = AF_INET; s->dest_addr.sin_family = AF_INET;
s->dest_addr.sin_port = htons(port); s->dest_addr.sin_port = htons(port);
s->dest_addr_len = sizeof(s->dest_addr);
return 0; return 0;
#endif #endif
} }
@@ -441,11 +442,7 @@ static int udp_write(URLContext *h, uint8_t *buf, int size)
for(;;) { for(;;) {
ret = sendto (s->udp_fd, buf, size, 0, ret = sendto (s->udp_fd, buf, size, 0,
(struct sockaddr *) &s->dest_addr, (struct sockaddr *) &s->dest_addr,
#ifndef CONFIG_IPV6
sizeof (s->dest_addr));
#else
s->dest_addr_len); s->dest_addr_len);
#endif
if (ret < 0) { if (ret < 0) {
if (ff_neterrno() != FF_NETERROR(EINTR) && if (ff_neterrno() != FF_NETERROR(EINTR) &&
ff_neterrno() != FF_NETERROR(EAGAIN)) ff_neterrno() != FF_NETERROR(EAGAIN))