transition_region.c: bugfix regression with in built circle region

[melted] / src / modules / avformat / Makefile

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 38bfbec..0007fd9 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -4,13 +4,18 @@ include config.mak
 TARGET = ../libmltavformat$(LIBSUF)
 
 OBJS = factory.o \
-          producer_avformat.o \
-          consumer_avformat.o \
           filter_avcolour_space.o \
-          filter_avresample.o
+          filter_avresample.o \
+          filter_avdeinterlace.o
 
-ifdef MMX_FLAGS
-       OBJS += filter_avdeinterlace.o
+ifdef SWSCALE
+OBJS += filter_swscale.o
+endif
+
+ifdef CODECS
+OBJS += producer_avformat.o \
+           consumer_avformat.o
+CFLAGS += -DCODECS
 endif
 
 CFLAGS+=-I../..
@@ -37,7 +42,7 @@ all:  $(TARGET)
 
 $(LOCAL_FFMPEG_OBJS):
        if [ $(LOCAL_FFMPEG) ] ; then \
-               $(MAKE) -C ffmpeg lib ; \
+               $(MAKE) -C ffmpeg ffmpeg ; \
        fi
 
 $(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)