[FFmpeg-cvslog] r25386 - in trunk/libavformat: network.h udp.c

[mstorsjo]

Author: mstorsjo
Date: Thu Oct  7 09:53:31 2010
New Revision: 25386

Log:
Move multicast address identification fallback macros to network.h from udp.c

Modified:
   trunk/libavformat/network.h
   trunk/libavformat/udp.c

Modified: trunk/libavformat/network.h
==============================================================================
--- trunk/libavformat/network.h	Thu Oct  7 03:57:39 2010	(r25385)
+++ trunk/libavformat/network.h	Thu Oct  7 09:53:31 2010	(r25386)
@@ -155,4 +155,11 @@ const char *ff_gai_strerror(int ecode);
 #define INET6_ADDRSTRLEN INET_ADDRSTRLEN
 #endif
 
+#ifndef IN_MULTICAST
+#define IN_MULTICAST(a) ((((uint32_t)(a)) & 0xf0000000) == 0xe0000000)
+#endif
+#ifndef IN6_IS_ADDR_MULTICAST
+#define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff)
+#endif
+
 #endif /* AVFORMAT_NETWORK_H */

Modified: trunk/libavformat/udp.c
==============================================================================
--- trunk/libavformat/udp.c	Thu Oct  7 03:57:39 2010	(r25385)
+++ trunk/libavformat/udp.c	Thu Oct  7 09:53:31 2010	(r25386)
@@ -40,12 +40,6 @@
 #define IPV6_ADD_MEMBERSHIP IPV6_JOIN_GROUP
 #define IPV6_DROP_MEMBERSHIP IPV6_LEAVE_GROUP
 #endif
-#ifndef IN_MULTICAST
-#define IN_MULTICAST(a) ((((uint32_t)(a)) & 0xf0000000) == 0xe0000000)
-#endif
-#ifndef IN6_IS_ADDR_MULTICAST
-#define IN6_IS_ADDR_MULTICAST(a) (((uint8_t *) (a))[0] == 0xff)
-#endif
 
 typedef struct {
     int udp_fd;