Mercurial > libavformat.hg

comparison rtsp.c @ 5775:7a123cc24a81 libavformat

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename url_split to ff_url_split Since this function isn't in the public API, it should have an ff_ prefix.
author mstorsjo
date Mon, 08 Mar 2010 09:03:25 +0000
parents a292ef47e2f9
children d34f985d6e8f
comparison
equal deleted inserted replaced
5774:66e85b4ca68a 5775:7a123cc24a81
444 /* get the control url */ 444 /* get the control url */
445 st = s->streams[s->nb_streams - 1]; 445 st = s->streams[s->nb_streams - 1];
446 rtsp_st = st->priv_data; 446 rtsp_st = st->priv_data;
447 447
448 /* XXX: may need to add full url resolution */ 448 /* XXX: may need to add full url resolution */
449 url_split(proto, sizeof(proto), NULL, 0, NULL, 0, 449 ff_url_split(proto, sizeof(proto), NULL, 0, NULL, 0,
450 NULL, NULL, 0, p); 450 NULL, NULL, 0, p);
451 if (proto[0] == '\0') { 451 if (proto[0] == '\0') {
452 /* relative control URL */ 452 /* relative control URL */
453 if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/') 453 if (rtsp_st->control_url[strlen(rtsp_st->control_url)-1]!='/')
454 av_strlcat(rtsp_st->control_url, "/", 454 av_strlcat(rtsp_st->control_url, "/",
1388 1388
1389 if (!ff_network_init()) 1389 if (!ff_network_init())
1390 return AVERROR(EIO); 1390 return AVERROR(EIO);
1391 redirect: 1391 redirect:
1392 /* extract hostname and port */ 1392 /* extract hostname and port */
1393 url_split(NULL, 0, auth, sizeof(auth), 1393 ff_url_split(NULL, 0, auth, sizeof(auth),
1394 host, sizeof(host), &port, path, sizeof(path), s->filename); 1394 host, sizeof(host), &port, path, sizeof(path), s->filename);
1395 if (*auth) { 1395 if (*auth) {
1396 int auth_len = strlen(auth), b64_len = ((auth_len + 2) / 3) * 4 + 1; 1396 int auth_len = strlen(auth), b64_len = ((auth_len + 2) / 3) * 4 + 1;
1397 1397
1398 if (!(rt->auth_b64 = av_malloc(b64_len))) 1398 if (!(rt->auth_b64 = av_malloc(b64_len)))