diff options
| author | Steven Liu <lq@chinaffmpeg.org> | 2019-04-15 19:45:39 +0800 |
|---|---|---|
| committer | Steven Liu <lq@chinaffmpeg.org> | 2019-04-15 19:45:39 +0800 |
| commit | 7f78a1b1caeafae1b2b33f0ee745bb255e72ede1 (patch) | |
| tree | 48cc107dd264aee6933cfe220d90328ffebf378a | |
| parent | 1ae8a1073ba8a3ceb9f51d9350785c27530aa469 (diff) | |
| download | ffmpeg-7f78a1b1caeafae1b2b33f0ee745bb255e72ede1.tar.gz | |
Revert "lavf/rtsp.c: Fix stimeout option not applied on http tunnel"
This reverts commit 1ae8a1073ba8a3ceb9f51d9350785c27530aa469.
| -rw-r--r-- | libavformat/rtsp.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index 8349840c96..033095905d 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -1744,9 +1744,6 @@ redirect: char httpname[1024]; char sessioncookie[17]; char headers[1024]; - AVDictionary *options = NULL; - - av_dict_set_int(&options, "timeout", rt->stimeout, 0); ff_url_join(httpname, sizeof(httpname), https_tunnel ? "https" : "http", auth, host, port, "%s", path); snprintf(sessioncookie, sizeof(sessioncookie), "%08x%08x", @@ -1777,8 +1774,7 @@ redirect: } /* complete the connection */ - if (ffurl_connect(rt->rtsp_hd, &options)) { - av_dict_free(&options); + if (ffurl_connect(rt->rtsp_hd, NULL)) { err = AVERROR(EIO); goto fail; } @@ -1822,12 +1818,10 @@ redirect: ff_http_init_auth_state(rt->rtsp_hd_out, rt->rtsp_hd); /* complete the connection */ - if (ffurl_connect(rt->rtsp_hd_out, &options)) { - av_dict_free(&options); + if (ffurl_connect(rt->rtsp_hd_out, NULL)) { err = AVERROR(EIO); goto fail; } - av_dict_free(&options); } else { int ret; /* open the tcp connection */ |