[FFmpeg-cvslog] build: Merge pthreads/w32threads OBJS declarations

Diego Biurrun git at videolan.org
Fri Dec 13 21:42:03 CET 2013


ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Thu Dec 12 16:27:30 2013 +0100| [79d9884e9590c28a0a7ca802a3ba54f2ff4ee423] | committer: Diego Biurrun

build: Merge pthreads/w32threads OBJS declarations

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=79d9884e9590c28a0a7ca802a3ba54f2ff4ee423
---

 libavcodec/Makefile |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 2925dd5..6dfb9a0 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                    \



More information about the ffmpeg-cvslog mailing list