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
b96bc946
Commit
b96bc946
authored
Feb 13, 2020
by
Marton Balint
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/libsrt: fix timeout unit confusion between milisec and microsec
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
90913abc
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
libsrt.c
libavformat/libsrt.c
+4
-4
No files found.
libavformat/libsrt.c
View file @
b96bc946
...
...
@@ -210,7 +210,7 @@ static int libsrt_network_wait_fd_timeout(URLContext *h, int eid, int fd, int wr
}
}
static
int
libsrt_listen
(
int
eid
,
int
fd
,
const
struct
sockaddr
*
addr
,
socklen_t
addrlen
,
URLContext
*
h
,
int
timeout
)
static
int
libsrt_listen
(
int
eid
,
int
fd
,
const
struct
sockaddr
*
addr
,
socklen_t
addrlen
,
URLContext
*
h
,
int
64_t
timeout
)
{
int
ret
;
int
reuse
=
1
;
...
...
@@ -243,7 +243,7 @@ static int libsrt_listen(int eid, int fd, const struct sockaddr *addr, socklen_t
return
ret
;
}
static
int
libsrt_listen_connect
(
int
eid
,
int
fd
,
const
struct
sockaddr
*
addr
,
socklen_t
addrlen
,
int
timeout
,
URLContext
*
h
,
int
will_try_next
)
static
int
libsrt_listen_connect
(
int
eid
,
int
fd
,
const
struct
sockaddr
*
addr
,
socklen_t
addrlen
,
int
64_t
timeout
,
URLContext
*
h
,
int
will_try_next
)
{
int
ret
;
...
...
@@ -447,7 +447,7 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags)
}
if
(
s
->
mode
==
SRT_MODE_LISTENER
)
{
// multi-client
if
((
ret
=
libsrt_listen
(
s
->
eid
,
fd
,
cur_ai
->
ai_addr
,
cur_ai
->
ai_addrlen
,
h
,
open_timeout
/
1000
))
<
0
)
if
((
ret
=
libsrt_listen
(
s
->
eid
,
fd
,
cur_ai
->
ai_addr
,
cur_ai
->
ai_addrlen
,
h
,
open_timeout
))
<
0
)
goto
fail1
;
fd
=
ret
;
}
else
{
...
...
@@ -458,7 +458,7 @@ static int libsrt_setup(URLContext *h, const char *uri, int flags)
}
if
((
ret
=
libsrt_listen_connect
(
s
->
eid
,
fd
,
cur_ai
->
ai_addr
,
cur_ai
->
ai_addrlen
,
open_timeout
/
1000
,
h
,
!!
cur_ai
->
ai_next
))
<
0
)
{
open_timeout
,
h
,
!!
cur_ai
->
ai_next
))
<
0
)
{
if
(
ret
==
AVERROR_EXIT
)
goto
fail1
;
else
...
...
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