diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 12:30:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-14 12:30:40 +0200 |
| commit | 1a01f367a40f8df03282f66dc77e63f7fa8491f5 (patch) | |
| tree | 1d0eb6f78f21d1228fa26ec5a6200ce16eae527b /libavformat | |
| parent | ab06436dbff52efb8b46f857b0412f987ea83370 (diff) | |
| parent | 2427ac6ccd868811d1fe9df7c64c50ca58abe6f6 (diff) | |
| download | ffmpeg-1a01f367a40f8df03282f66dc77e63f7fa8491f5.tar.gz | |
Merge commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6'
* commit '2427ac6ccd868811d1fe9df7c64c50ca58abe6f6':
rtpproto: Update the parameter documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtpproto.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index 00a3bcd3ba..2dc381a25f 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -235,9 +235,10 @@ static void rtp_parse_addr_list(URLContext *h, char *buf, * 'localrtcpport=n' : set the local rtcp port to n * 'pkt_size=n' : set max packet size * 'connect=0/1' : do a connect() on the UDP socket + * 'sources=ip[,ip]' : list allowed source IP addresses + * 'block=ip[,ip]' : list disallowed source IP addresses * deprecated option: * 'localport=n' : set the local port to n - * 'sources=ip[,ip]' : list allowed source IP addresses * * if rtcpport isn't set the rtcp port will be the rtp port + 1 * if local rtp port isn't set any available port will be used for the local |