diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-02 10:39:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-02 10:39:46 +0200 |
| commit | ca1b02910889b44720d3937530c0f544c3a4aa2b (patch) | |
| tree | ce838027bb6f3fb1eaada2beaab3f300f64f899e /libavformat | |
| parent | bff371e34ce2177ab8aaa74b71a7fbea500a786b (diff) | |
| parent | fd8f91e3f44a2bdbefaaebead388133c5fdd3423 (diff) | |
| download | ffmpeg-ca1b02910889b44720d3937530c0f544c3a4aa2b.tar.gz | |
Merge commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423'
* commit 'fd8f91e3f44a2bdbefaaebead388133c5fdd3423':
rtsp: Simplify code for forming the remote peer url
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/rtsp.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 0a76c62173..5ae429aa51 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1481,18 +1481,15 @@ int ff_rtsp_make_setup_request(AVFormatContext *s, const char *host, int port, case RTSP_LOWER_TRANSPORT_UDP: { char url[1024], options[30] = ""; + const char *peer = host; if (rt->rtsp_flags & RTSP_FLAG_FILTER_SRC) av_strlcpy(options, "?connect=1", sizeof(options)); /* Use source address if specified */ - if (reply->transports[0].source[0]) { - ff_url_join(url, sizeof(url), "rtp", NULL, - reply->transports[0].source, - reply->transports[0].server_port_min, "%s", options); - } else { - ff_url_join(url, sizeof(url), "rtp", NULL, host, - reply->transports[0].server_port_min, "%s", options); - } + if (reply->transports[0].source[0]) + peer = reply->transports[0].source; + ff_url_join(url, sizeof(url), "rtp", NULL, peer, + reply->transports[0].server_port_min, "%s", options); if (!(rt->server_type == RTSP_SERVER_WMS && i > 1) && ff_rtp_set_remote_url(rtsp_st->rtp_handle, url) < 0) { err = AVERROR_INVALIDDATA; |