Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / Makefile

diff --git a/libavformat/Makefile b/libavformat/Makefile
index 55f6152f8d85ad0f9c96ce81f6ca9dff806dbed3..d11cd7eca785c3bb00a6d34cd78704e5c37b0f00 100644 (file)
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -1,5 +1,3 @@
-include $(SUBDIR)../config.mak
-
 NAME = avformat
 FFLIBS = avcodec avutil
 
@@ -340,9 +338,6 @@ OBJS-$(CONFIG_UDP_PROTOCOL)              += udp.o
 # libavdevice dependencies
 OBJS-$(CONFIG_JACK_INDEV)                += timefilter.o
 
-EXAMPLES  = output
 TESTPROGS = timefilter
 
 include $(SUBDIR)../subdir.mak
-
-$(SUBDIR)output-example$(EXESUF): ELIBS = -lswscale