* qatar/master:
build: Merge pthreads/w32threads OBJS declarations
Conflicts:
libavcodec/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>
# 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_OS2THREADS) += pthread.o pthread_slice.o pthread_frame.o
+ OBJS-$(HAVE_THREADS) += pthread.o pthread_slice.o pthread_frame.o
+OBJS-$(CONFIG_FRAME_THREAD_ENCODER) += frame_thread_encoder.o
+
+# Windows resource file
+SLIBOBJS-$(HAVE_GNU_WINDRES) += avcodecres.o
+
SKIPHEADERS += %_tablegen.h \
%_tables.h \
aac_tablegen_decl.h \