[FFmpeg-cvslog] Revert "lavf/rtsp.c: Fix stimeout option not applied on http tunnel"
Steven Liu
git at videolan.org
Mon Apr 15 14:44:34 EEST 2019
ffmpeg | branch: master | Steven Liu <lq at chinaffmpeg.org> | Mon Apr 15 19:43:21 2019 +0800| [bbae8d08f592a029cda5932ddc4b39694034fe53] | committer: Steven Liu
Revert "lavf/rtsp.c: Fix stimeout option not applied on http tunnel"
This reverts commit f502bd5432c9d7a34392ec3147bc5b5e3a868d9c.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=bbae8d08f592a029cda5932ddc4b39694034fe53
---
libavformat/rtsp.c | 10 ++--------
1 file 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 */
More information about the ffmpeg-cvslog
mailing list