diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-07-20 10:37:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-07-20 10:39:53 +0200 |
| commit | 48353325372ae7c1721c55bafe33cf0816301a5e (patch) | |
| tree | 02c84e6d19e4caba3afb91dbb5771cea7216dcb2 /libavformat/rtsp.h | |
| parent | 73b2043d727029ecde19c1d92bda8411f18b8e55 (diff) | |
| parent | 36fb0d02a1faa11eaee51de01fb4061ad6092af9 (diff) | |
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>
Diffstat (limited to 'libavformat/rtsp.h')
| -rw-r--r-- | libavformat/rtsp.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/rtsp.h b/libavformat/rtsp.h index a68b204139..e4b1cd6fa7 100644 --- a/libavformat/rtsp.h +++ b/libavformat/rtsp.h @@ -435,8 +435,7 @@ typedef struct RTSPStream { //@{ int sdp_port; /**< port (from SDP content) */ struct sockaddr_storage sdp_ip; /**< IP address (from SDP content) */ - int ssm; /**< Whether the stream should use source-specific multicast or not (from SDP content) */ - struct sockaddr_storage source_ip; /**< Source-specific multicast source IP address (from SDP content) */ + char source_addr[100]; /**< Source-specific multicast source IP address (from SDP content) */ int sdp_ttl; /**< IP Time-To-Live (from SDP content) */ int sdp_payload_type; /**< payload type */ //@} |