Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Jul 2013 08:37:25 +0000 (10:37 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 20 Jul 2013 08:39:53 +0000 (10:39 +0200)
* commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9':
  rtsp: Support multicast source filters (RFC 4570)
  rtpproto: Check the source IP if one single source has been specified
  rtpproto: Support IGMPv3 source specific multicast inclusion

Conflicts:
libavformat/rtpproto.c
libavformat/rtsp.c
libavformat/rtsp.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/rtpproto.c
libavformat/rtsp.c
libavformat/rtsp.h

@@@ -135,11 -148,10 +148,11 @@@ static void build_udp_url(char *buf, in
          url_add_option(buf, buf_size, "ttl=%d", ttl);
      if (max_packet_size >=0)
          url_add_option(buf, buf_size, "pkt_size=%d", max_packet_size);
-     if (ssm)
-         url_add_option(buf, buf_size, "sources=%s", source_addr);
      if (connect)
          url_add_option(buf, buf_size, "connect=1");
 +    url_add_option(buf, buf_size, "fifo_size=0");
+     if (sources && sources[0])
+         url_add_option(buf, buf_size, "sources=%s", sources);
  }
  
  /**
Simple merge
Simple merge