projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7c33887
)
build: Merge pthreads/w32threads OBJS declarations
author
Diego Biurrun
<diego@biurrun.de>
Thu, 12 Dec 2013 15:27:30 +0000
(16:27 +0100)
committer
Diego Biurrun
<diego@biurrun.de>
Fri, 13 Dec 2013 15:47:50 +0000
(16:47 +0100)
libavcodec/Makefile
patch
|
blob
|
history
diff --git
a/libavcodec/Makefile
b/libavcodec/Makefile
index 2925dd56c1578b52361ed716c4be27672bb2db71..6dfb9a0e9f2988e533eb58f5924b8c1756206a56 100644
(file)
--- a/
libavcodec/Makefile
+++ b/
libavcodec/Makefile
@@
-676,8
+676,7
@@
OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o
# thread libraries
OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o
-OBJS-$(HAVE_PTHREADS) += pthread.o pthread_slice.o pthread_frame.o
-OBJS-$(HAVE_W32THREADS) += pthread.o pthread_slice.o pthread_frame.o
+OBJS-$(HAVE_THREADS) += pthread.o pthread_slice.o pthread_frame.o
SKIPHEADERS += %_tablegen.h \
%_tables.h \