Drop usage of av_demuxer_open() in avformat v53.

[mlt] / src / modules / avformat / Makefile

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index 74cdbbe6eedbc785dfb68070bdb59ad611ea8ab2..b3f96553309fc0d9fa005fd2b9913a209584b353 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -7,7 +7,6 @@ include config.mak
 LDFLAGS += -lavformat$(AVFORMAT_SUFFIX)
 LDFLAGS += -lavcodec$(AVFORMAT_SUFFIX)
 LDFLAGS += -lavutil$(AVFORMAT_SUFFIX)
-LDFLAGS += -lavdevice$(AVFORMAT_SUFFIX)
 LDFLAGS += $(EXTRA_LIBS)
 
 ifndef CODECS
@@ -28,6 +27,11 @@ endif
 CFLAGS += -DFILTERS
 endif
 
+ifdef VDPAU
+CFLAGS += -DVDPAU `pkg-config --cflags x11`
+LDFLAGS += $(LIBDL) `pkg-config --libs x11`
+endif
+
 ifdef CODECS
 OBJS += producer_avformat.o \
            consumer_avformat.o
@@ -39,15 +43,24 @@ CFLAGS += -DSWSCALE
 LDFLAGS += -lswscale$(AVFORMAT_SUFFIX)
 endif
 
+ifdef DEVICES
+CFLAGS += -DAVDEVICE
+LDFLAGS += -lavdevice$(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)
+                    ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX)
 endif
 
 SRCS := $(OBJS:.o=.c)
 
+ifeq ($(targetos), MinGW)
+OBJS += ../../win32/win32.o
+SRCS += ../../win32/win32.c
+endif
+
 all:   $(TARGET)
 
 $(LOCAL_FFMPEG_OBJS):
@@ -59,12 +72,12 @@ $(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
        $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:        $(SRCS)
-       if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg dep ; fi
+       #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
+       if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg distclean ; fi
 
 clean: 
        #if [ $(LOCAL_FFMPEG) ] ; then $(MAKE) -C ffmpeg clean ; fi
@@ -74,6 +87,7 @@ install: all
        install -m 755 $(TARGET) "$(DESTDIR)$(libdir)/mlt"
        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)" 2> /dev/null || true