aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorRonald S. Bultje <rsbultje@gmail.com>2013-03-13 21:59:33 -0700
committerMichael Niedermayer <michaelni@gmx.at>2013-03-14 15:04:17 +0100
commitb76d853697a8b558e597ed4a6fc5a088b6c602c7 (patch)
tree8a95045a50b1554f23be8c27de6a8129aef88560 /libavcodec/Makefile
parent4a88d81c9e3758dfad6bf35681e27b9c10f0b346 (diff)
downloadffmpeg-b76d853697a8b558e597ed4a6fc5a088b6c602c7.tar.gz
lavc: make compilation of frame_thread_encoder.o optional.
Only compile if CONFIG_ENCODERS is enabled, i.e. if at least one encoder is to be compiled. This prevents it from being includes in a decoder-only build. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile8
1 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index a1e0171dfb..e4fccf1512 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -773,9 +773,11 @@ OBJS-$(CONFIG_REMOVE_EXTRADATA_BSF) += remove_extradata_bsf.o
OBJS-$(CONFIG_TEXT2MOVSUB_BSF) += movsub_bsf.o
# thread libraries
-OBJS-$(HAVE_PTHREADS) += pthread.o frame_thread_encoder.o
-OBJS-$(HAVE_W32THREADS) += pthread.o frame_thread_encoder.o
-OBJS-$(HAVE_OS2THREADS) += pthread.o frame_thread_encoder.o
+OBJS-$(HAVE_PTHREADS) += pthread.o
+OBJS-$(HAVE_W32THREADS) += pthread.o
+OBJS-$(HAVE_OS2THREADS) += pthread.o
+
+OBJS-$(CONFIG_FRAME_THREAD_ENCODER) += frame_thread_encoder.o
SKIPHEADERS += %_tablegen.h \
%_tables.h \