Changeset 48353325 in ffmpeg

Timestamp:

Jul 20, 2013, 8:39:53 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

b6740179

Parents:

73b2043d (diff), 36fb0d02 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Michael Niedermayer <michaelni@gmx.at> (07/20/13 08:37:25)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (07/20/13 08:39:53)

Message:

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

(No files)