diff options
| author | Martin Storsjö <martin@martin.st> | 2013-08-01 09:51:10 +0300 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2013-08-01 12:11:17 +0300 |
| commit | fd8f91e3f44a2bdbefaaebead388133c5fdd3423 (patch) | |
| tree | b2406fef2efc56328611a6e0fa3a97b64714a86a /libavformat/rtsp.c | |
| parent | 3c8bff0740abb3785968823429e77bd41c65debf (diff) | |
rtsp: Simplify code for forming the remote peer url
Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/rtsp.c')
| -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 db96bc6dfb..266f052366 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1483,18 +1483,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; |