[FFmpeg-cvslog] Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jul 20 10:37:25 2013 +0200| [48353325372ae7c1721c55bafe33cf0816301a5e] | committer: Michael Niedermayer

Merge commit '36fb0d02a1faa11eaee51de01fb4061ad6092af9'

* 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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48353325372ae7c1721c55bafe33cf0816301a5e
---