Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
bbae8d08
Commit
bbae8d08
authored
Apr 15, 2019
by
Steven Liu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "lavf/rtsp.c: Fix stimeout option not applied on http tunnel"
This reverts commit
f502bd54
.
parent
f502bd54
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
8 deletions
+2
-8
rtsp.c
libavformat/rtsp.c
+2
-8
No files found.
libavformat/rtsp.c
View file @
bbae8d08
...
...
@@ -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 */
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment