Sometimes x264 is crashing on single or first pass with multithreading.

[mlt] / src / modules / avformat / Makefile

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index c827150eacf65a6e22ed3a68b40eee9b18e9cbf8..6e0e86d02b3e503d31d6dd2a8102cc4644218be4 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -1,16 +1,14 @@
-include ../../../config.mak
-
 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 += -lavdevice$(AVFORMAT_SUFFIX)
-LDFLAGS += -lm $(EXTRA_LIBS)
+LDFLAGS += $(EXTRA_LIBS)
 
 ifndef CODECS
 TARGET = ../libmltffmpeg$(LIBSUF)
@@ -30,6 +28,11 @@ endif
 CFLAGS += -DFILTERS
 endif
 
+ifdef VDPAU
+CFLAGS += -DVDPAU `pkg-config --cflags x11`
+LDFLAGS += -ldl `pkg-config --libs x11`
+endif
+
 ifdef CODECS
 OBJS += producer_avformat.o \
            consumer_avformat.o
@@ -61,12 +64,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