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
0830e911
Commit
0830e911
authored
Mar 02, 2020
by
phunkyfish
Committed by
Marton Balint
Mar 08, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avformat/udp: support w32pthreads compat
Signed-off-by:
Marton Balint
<
cus@passwd.hu
>
parent
60e26346
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
w32pthreads.h
compat/w32pthreads.h
+8
-0
udp.c
libavformat/udp.c
+6
-1
No files found.
compat/w32pthreads.h
View file @
0830e911
...
@@ -63,6 +63,9 @@ typedef CONDITION_VARIABLE pthread_cond_t;
...
@@ -63,6 +63,9 @@ typedef CONDITION_VARIABLE pthread_cond_t;
#define InitializeCriticalSection(x) InitializeCriticalSectionEx(x, 0, 0)
#define InitializeCriticalSection(x) InitializeCriticalSectionEx(x, 0, 0)
#define WaitForSingleObject(a, b) WaitForSingleObjectEx(a, b, FALSE)
#define WaitForSingleObject(a, b) WaitForSingleObjectEx(a, b, FALSE)
#define PTHREAD_CANCEL_ENABLE 1
#define PTHREAD_CANCEL_DISABLE 0
static
av_unused
unsigned
__stdcall
attribute_align_arg
win32thread_worker
(
void
*
arg
)
static
av_unused
unsigned
__stdcall
attribute_align_arg
win32thread_worker
(
void
*
arg
)
{
{
pthread_t
*
h
=
(
pthread_t
*
)
arg
;
pthread_t
*
h
=
(
pthread_t
*
)
arg
;
...
@@ -180,4 +183,9 @@ static inline int pthread_cond_signal(pthread_cond_t *cond)
...
@@ -180,4 +183,9 @@ static inline int pthread_cond_signal(pthread_cond_t *cond)
return
0
;
return
0
;
}
}
static
inline
int
pthread_setcancelstate
(
int
state
,
int
*
oldstate
)
{
return
0
;
}
#endif
/* COMPAT_W32PTHREADS_H */
#endif
/* COMPAT_W32PTHREADS_H */
libavformat/udp.c
View file @
0830e911
...
@@ -61,8 +61,13 @@
...
@@ -61,8 +61,13 @@
#define IPPROTO_UDPLITE 136
#define IPPROTO_UDPLITE 136
#endif
#endif
#if HAVE_W32THREADS
#undef HAVE_PTHREAD_CANCEL
#define HAVE_PTHREAD_CANCEL 1
#endif
#if HAVE_PTHREAD_CANCEL
#if HAVE_PTHREAD_CANCEL
#include
<pthread.h>
#include
"libavutil/thread.h"
#endif
#endif
#ifndef IPV6_ADD_MEMBERSHIP
#ifndef IPV6_ADD_MEMBERSHIP
...
...
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