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
90f9a583
Commit
90f9a583
authored
May 12, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
w32pthreads: move from lavc to compat/
It will be used in other places than lavc.
parent
e69222c5
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
7 additions
and
8 deletions
+7
-8
Makefile
Makefile
+1
-1
w32pthreads.h
compat/w32pthreads.h
+3
-3
Makefile
libavcodec/Makefile
+0
-1
pthread.c
libavcodec/pthread.c
+1
-1
vp8.h
libavcodec/vp8.h
+1
-1
network.c
libavformat/network.c
+1
-1
No files found.
Makefile
View file @
90f9a583
...
@@ -84,7 +84,7 @@ FFLIBS := avutil
...
@@ -84,7 +84,7 @@ FFLIBS := avutil
DATA_FILES
:=
$
(
wildcard
$(SRC_PATH)
/presets/
*
.avpreset
)
DATA_FILES
:=
$
(
wildcard
$(SRC_PATH)
/presets/
*
.avpreset
)
SKIPHEADERS
=
cmdutils_common_opts.h
SKIPHEADERS
=
cmdutils_common_opts.h
compat/w32pthreads.h
include
$(SRC_PATH)/common.mak
include
$(SRC_PATH)/common.mak
...
...
libavcodec
/w32pthreads.h
→
compat
/w32pthreads.h
View file @
90f9a583
...
@@ -26,8 +26,8 @@
...
@@ -26,8 +26,8 @@
* w32threads to pthreads wrapper
* w32threads to pthreads wrapper
*/
*/
#ifndef
AVCODEC
_W32PTHREADS_H
#ifndef
LIBAV
_W32PTHREADS_H
#define
AVCODEC
_W32PTHREADS_H
#define
LIBAV
_W32PTHREADS_H
/* Build up a pthread-like API using underlying Windows API. Have only static
/* Build up a pthread-like API using underlying Windows API. Have only static
* methods so as to not conflict with a potentially linked in pthread-win32
* methods so as to not conflict with a potentially linked in pthread-win32
...
@@ -276,4 +276,4 @@ static void w32thread_init(void)
...
@@ -276,4 +276,4 @@ static void w32thread_init(void)
}
}
#endif
/*
AVCODEC
_W32PTHREADS_H */
#endif
/*
LIBAV
_W32PTHREADS_H */
libavcodec/Makefile
View file @
90f9a583
...
@@ -679,7 +679,6 @@ SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
...
@@ -679,7 +679,6 @@ SKIPHEADERS-$(CONFIG_MPEG_XVMC_DECODER) += xvmc.h
SKIPHEADERS-$(CONFIG_VAAPI)
+=
vaapi_internal.h
SKIPHEADERS-$(CONFIG_VAAPI)
+=
vaapi_internal.h
SKIPHEADERS-$(CONFIG_VDA)
+=
vda.h
SKIPHEADERS-$(CONFIG_VDA)
+=
vda.h
SKIPHEADERS-$(CONFIG_VDPAU)
+=
vdpau.h
SKIPHEADERS-$(CONFIG_VDPAU)
+=
vdpau.h
SKIPHEADERS-$(HAVE_W32THREADS)
+=
w32pthreads.h
EXAMPLES
=
api
EXAMPLES
=
api
...
...
libavcodec/pthread.c
View file @
90f9a583
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
#if HAVE_PTHREADS
#if HAVE_PTHREADS
#include <pthread.h>
#include <pthread.h>
#elif HAVE_W32THREADS
#elif HAVE_W32THREADS
#include "w32pthreads.h"
#include "
compat/
w32pthreads.h"
#endif
#endif
typedef
int
(
action_func
)(
AVCodecContext
*
c
,
void
*
arg
);
typedef
int
(
action_func
)(
AVCodecContext
*
c
,
void
*
arg
);
...
...
libavcodec/vp8.h
View file @
90f9a583
...
@@ -36,7 +36,7 @@
...
@@ -36,7 +36,7 @@
#if HAVE_PTHREADS
#if HAVE_PTHREADS
#include <pthread.h>
#include <pthread.h>
#elif HAVE_W32THREADS
#elif HAVE_W32THREADS
#include "w32pthreads.h"
#include "
compat/
w32pthreads.h"
#endif
#endif
#define VP8_MAX_QUANT 127
#define VP8_MAX_QUANT 127
...
...
libavformat/network.c
View file @
90f9a583
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
#if HAVE_PTHREADS
#if HAVE_PTHREADS
#include <pthread.h>
#include <pthread.h>
#else
#else
#include "
libavcodec
/w32pthreads.h"
#include "
compat
/w32pthreads.h"
#endif
#endif
#endif
#endif
...
...
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