diff options
| author | Martin Storsjö <martin@martin.st> | 2010-03-05 22:35:21 +0000 |
|---|---|---|
| committer | Martin Storsjö <martin@martin.st> | 2010-03-05 22:35:21 +0000 |
| commit | 57b5555c91a9792e3ac99102b3d1a5c44b45fdd9 (patch) | |
| tree | e9b6fa60b663ea3dbbf3bebc1c0c2943246293c4 /libavformat/rtpproto.c | |
| parent | 780d7897a9c9295b43f1f0e9b49a11f99cd402c3 (diff) | |
Use ff_url_join for assembling URLs, instead of snprintf
This ensures proper escaping of numerical IPv6 addresses.
The RTSP (de)muxer needs its own network initialization, since it isn't
a protocol and url_open hasn't been called yet.
Originally committed as revision 22226 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/rtpproto.c')
| -rw-r--r-- | libavformat/rtpproto.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/rtpproto.c b/libavformat/rtpproto.c index 4af97c1822..4de905e0b3 100644 --- a/libavformat/rtpproto.c +++ b/libavformat/rtpproto.c @@ -67,10 +67,10 @@ int rtp_set_remote_url(URLContext *h, const char *uri) url_split(NULL, 0, NULL, 0, hostname, sizeof(hostname), &port, path, sizeof(path), uri); - snprintf(buf, sizeof(buf), "udp://%s:%d%s", hostname, port, path); + ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port, "%s", path); udp_set_remote_url(s->rtp_hd, buf); - snprintf(buf, sizeof(buf), "udp://%s:%d%s", hostname, port + 1, path); + ff_url_join(buf, sizeof(buf), "udp", NULL, hostname, port + 1, "%s", path); udp_set_remote_url(s->rtcp_hd, buf); return 0; } @@ -101,7 +101,7 @@ static void build_udp_url(char *buf, int buf_size, int local_port, int ttl, int max_packet_size) { - snprintf(buf, buf_size, "udp://%s:%d", hostname, port); + ff_url_join(buf, buf_size, "udp", NULL, hostname, port, NULL); if (local_port >= 0) url_add_option(buf, buf_size, "localport=%d", local_port); if (ttl >= 0) |