Fix encoding audio distortion for planar codecs (3576437)

[mlt] / src / modules / avformat / Makefile

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 42180f7ff6bc678944a7fe94a1d047b429baa50f..14ecbb84235da5c05d7e432bdcca343c542740de 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,68 +1,79 @@
+CFLAGS += -I../..
+LDFLAGS += -L../../framework -lmlt -lpthread
+
 include ../../../config.mak
 include config.mak
 
+LDFLAGS += -lavformat$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavcodec$(AVFORMAT_SUFFIX)
+LDFLAGS += -lavutil$(AVFORMAT_SUFFIX)
+LDFLAGS += $(EXTRA_LIBS)
+
+ifndef CODECS
+TARGET = ../libmltffmpeg$(LIBSUF)
+else
 TARGET = ../libmltavformat$(LIBSUF)
+endif
 
-OBJS = factory.o \
-          producer_avformat.o \
-          consumer_avformat.o \
-          filter_avcolour_space.o \
-          filter_avresample.o
+OBJS = factory.o
 
-ifdef MMX_FLAGS
-       OBJS += filter_avdeinterlace.o
+ifdef FILTERS
+OBJS += filter_avcolour_space.o \
+           filter_avresample.o \
+           filter_avdeinterlace.o
+ifdef SWSCALE
+OBJS += filter_swscale.o
+endif
+CFLAGS += -DFILTERS
 endif
 
-CFLAGS+=-I../..
-
-LDFLAGS+=-L../../framework
+ifdef VDPAU
+CFLAGS += -DVDPAU `pkg-config --cflags x11`
+LDFLAGS += $(LIBDL) `pkg-config --libs x11`
+endif
 
-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) -lavdevice$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
+ifdef CODECS
+OBJS += producer_avformat.o \
+           consumer_avformat.o
+CFLAGS += -DCODECS
+endif
 
 ifdef SWSCALE
-       CFLAGS+=-DSWSCALE
-       LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
+CFLAGS += -DSWSCALE
+LDFLAGS += -lswscale$(AVFORMAT_SUFFIX)
 endif
 
-ifdef LOCAL_FFMPEG
-       LOCAL_FFMPEG_OBJS = ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX) \
-                           ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX) \
-                           ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX) \
-                           ffmpeg/libavutil/libavdevice$(AVFORMAT_SUFFIX)
+ifdef DEVICES
+CFLAGS += -DAVDEVICE
+LDFLAGS += -lavdevice$(AVFORMAT_SUFFIX)
 endif
 
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)
 
-$(LOCAL_FFMPEG_OBJS):
-       if [ $(LOCAL_FFMPEG) ] ; then \
-               $(MAKE) -C ffmpeg ffmpeg ; \
-       fi
-
-$(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
+$(TARGET): $(OBJS)
        $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:        $(SRCS)
-       if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dep ; fi
        $(CC) -MM $(CFLAGS) $^ 1>.depend
 
 distclean:     clean
-       if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg distclean ; fi
        rm -f .depend
 
 clean: 
-       #if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
-       rm -f $(OBJS) $(TARGET)
+       rm -f $(OBJS) ../libmltffmpeg$(LIBSUF) ../libmltavformat$(LIBSUF)
 
 install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
-       install -d "$(DESTDIR)$(prefix)/share/mlt/avformat"
-       install -m 644 producer_avformat.yml "$(DESTDIR)$(prefix)/share/mlt/avformat"
+       install -d "$(DESTDIR)$(datadir)/mlt/avformat"
+       install -m 644 producer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat"
+       install -m 644 consumer_avformat.yml "$(DESTDIR)$(datadir)/mlt/avformat"
 
 uninstall:
-       rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)"
-       rm -rf "$(DESTDIR)$(prefix)/share/mlt/avformat" 
+       rm "$(DESTDIR)$(libdir)/mlt/libmltavformat$(LIBSUF)" 2> /dev/null || true
+       rm "$(DESTDIR)$(libdir)/mlt/libmltffmpeg$(LIBSUF)" 2> /dev/null || true
+       rm -rf "$(DESTDIR)$(datadir)/mlt/avformat"
 
 ifneq ($(wildcard .depend),)
 include .depend