From: François Revol <revol@free.fr>
Date: Thu, 18 Jan 2007 17:48:21 +0000 (+0000)
Subject: The long awaited BeOS cleanup, phase 1.1: removed useless ifdef, changed check for... 
X-Git-Tag: v0.5~10481
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c9c1a8e794d84acc0e72987c4ae06f6847bc2cab;p=coroid%2Fffmpeg_saccubus.git

The long awaited BeOS cleanup, phase 1.1: removed useless ifdef, changed check for net_server to IP_MULTICAST_TTL.

Originally committed as revision 7582 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 3a309c610..ee6ad20dc 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -359,7 +359,7 @@ static int udp_open(URLContext *h, const char *uri, int flags)
     getsockname(udp_fd, (struct sockaddr *)&my_addr1, &len);
     s->local_port = ntohs(my_addr1.sin_port);
 
-#ifndef CONFIG_BEOS_NETSERVER
+#ifdef IP_MULTICAST_TTL
     if (s->is_multicast) {
         if (h->flags & URL_WRONLY) {
             /* output */
@@ -387,7 +387,6 @@ static int udp_open(URLContext *h, const char *uri, int flags)
     udp_fd = udp_ipv6_set_local(h);
     if (udp_fd < 0)
         goto fail;
-#ifndef CONFIG_BEOS_NETSERVER
     if (s->is_multicast) {
         if (h->flags & URL_WRONLY) {
             if (udp_ipv6_set_multicast_ttl(udp_fd, s->ttl, (struct sockaddr *)&s->dest_addr) < 0)
@@ -398,7 +397,6 @@ static int udp_open(URLContext *h, const char *uri, int flags)
         }
     }
 #endif
-#endif
 
     if (is_output) {
         /* limit the tx buf size to limit latency */