From 9290f15d00881ce028a5c18810a8d5af07bad2c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Tue, 22 Jun 2010 14:15:00 +0000 Subject: Make the http protocol open the connection immediately in http_open again Also make the RTSP protocol use url_alloc and url_connect instead of relying on the delay open behaviour. Originally committed as revision 23710 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/rtsp.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'libavformat/rtsp.c') diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index fe64a5d..be63523 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1578,7 +1578,7 @@ redirect: av_get_random_seed(), av_get_random_seed()); /* GET requests */ - if (url_open(&rt->rtsp_hd, httpname, URL_RDONLY) < 0) { + if (url_alloc(&rt->rtsp_hd, httpname, URL_RDONLY) < 0) { err = AVERROR(EIO); goto fail; } @@ -1593,13 +1593,13 @@ redirect: ff_http_set_headers(rt->rtsp_hd, headers); /* complete the connection */ - if (url_read(rt->rtsp_hd, NULL, 0)) { + if (url_connect(rt->rtsp_hd)) { err = AVERROR(EIO); goto fail; } /* POST requests */ - if (url_open(&rt->rtsp_hd_out, httpname, URL_WRONLY) < 0 ) { + if (url_alloc(&rt->rtsp_hd_out, httpname, URL_WRONLY) < 0 ) { err = AVERROR(EIO); goto fail; } @@ -1634,6 +1634,11 @@ redirect: */ ff_http_init_auth_state(rt->rtsp_hd_out, rt->rtsp_hd); + /* complete the connection */ + if (url_connect(rt->rtsp_hd_out)) { + err = AVERROR(EIO); + goto fail; + } } else { /* open the tcp connection */ ff_url_join(tcpname, sizeof(tcpname), "tcp", NULL, host, port, NULL); -- cgit v1.1