diff options
author | Diego Biurrun <diego@biurrun.de> | 2013-12-12 16:27:30 +0100 |
---|---|---|
committer | Diego Biurrun <diego@biurrun.de> | 2013-12-13 16:47:50 +0100 |
commit | 79d9884e9590c28a0a7ca802a3ba54f2ff4ee423 (patch) | |
tree | 8863d27ea1e0de567dbfd73f833e700b3926246a /libavcodec | |
parent | 7c3388711b7243d059db39aa04b754baf2156934 (diff) | |
download | ffmpeg-79d9884e9590c28a0a7ca802a3ba54f2ff4ee423.tar.gz |
build: Merge pthreads/w32threads OBJS declarations
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/Makefile | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 2925dd56c1..6dfb9a0e9f 100644 --- 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 \ |