[SCM] libav/experimental: Check for the IPPROTO_IPV6 define before using it

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 63206a8ffb131e03c04173c1426090532d276ee9
Author: Martin Storsjö <martin at martin.st>
Date:   Mon Sep 20 06:38:40 2010 +0000

    Check for the IPPROTO_IPV6 define before using it
    
    This fixes building on FreeBSD in some configurations, if the IPv6 multicast
    structs are available, but IPPROTO_IPV6 isn't defined.
    
    Originally committed as revision 25147 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/udp.c b/libavformat/udp.c
index 3636d8c..83e8b37 100644
--- a/libavformat/udp.c
+++ b/libavformat/udp.c
@@ -96,7 +96,7 @@ static int udp_join_multicast_group(int sockfd, struct sockaddr *addr)
         }
     }
 #endif
-#if HAVE_STRUCT_IPV6_MREQ
+#if HAVE_STRUCT_IPV6_MREQ && defined(IPPROTO_IPV6)
     if (addr->sa_family == AF_INET6) {
         struct ipv6_mreq mreq6;
 
@@ -125,7 +125,7 @@ static int udp_leave_multicast_group(int sockfd, struct sockaddr *addr)
         }
     }
 #endif
-#if HAVE_STRUCT_IPV6_MREQ
+#if HAVE_STRUCT_IPV6_MREQ && defined(IPPROTO_IPV6)
     if (addr->sa_family == AF_INET6) {
         struct ipv6_mreq mreq6;
 

-- 
Libav/FFmpeg packaging