[FFmpeg-cvslog] r12340 - trunk/libavfilter/Makefile

vitor subversion
Wed Mar 5 19:26:44 CET 2008


Author: vitor
Date: Wed Mar  5 19:26:44 2008
New Revision: 12340

Log:
Fix avfilter compilation with --enable-shared and no libswscaler

Modified:
   trunk/libavfilter/Makefile

Modified: trunk/libavfilter/Makefile
==============================================================================
--- trunk/libavfilter/Makefile	(original)
+++ trunk/libavfilter/Makefile	Wed Mar  5 19:26:44 2008
@@ -12,9 +12,13 @@ OBJS = allfilters.o \
 HEADERS = avfilter.h
 
 EXTRALIBS := -L$(BUILD_ROOT)/libavcodec -lavcodec$(BUILDSUF) \
-             -L$(BUILD_ROOT)/libswscale -lswscale$(BUILDSUF) \
              -L$(BUILD_ROOT)/libavutil  -lavutil$(BUILDSUF) $(EXTRALIBS)
 
+ifeq ($(CONFIG_SWSCALER),yes)
+EXTRALIBS+=-L$(BUILD_ROOT)/libswscale
+EXTRALIBS+=-lswscale$(BUILDSUF)
+endif
+
 ifeq ($(CONFIG_AVFILTER_LAVF),yes)
 EXTRALIBS := -L$(BUILD_ROOT)/libavformat -lavformat$(BUILDSUF) $(EXTRALIBS)
 endif




More information about the ffmpeg-cvslog mailing list