aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat/Makefile
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-06-26 09:46:05 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2011-06-26 09:49:36 +0200
commit11096804340ac2cec37ef1bce828105bd0a7dfbe (patch)
tree6fe72598f348431548894c2c2eac280fa3a0f4b2 /libavformat/Makefile
parentb3ca11f07feb08738128f6b7127ccf8eb3f72ede (diff)
downloadffmpeg-11096804340ac2cec37ef1bce828105bd0a7dfbe.tar.gz
Revert "build: Remove redundant config.mak includes from subdirectory Makefiles."
This reverts commit a6213f3dce4006e0d47bd938e15832987d95efef.
Diffstat (limited to 'libavformat/Makefile')
-rw-r--r--libavformat/Makefile2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index d11cd7eca7..e5ec44bfb6 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -1,3 +1,5 @@
+include $(SUBDIR)../config.mak
+
NAME = avformat
FFLIBS = avcodec avutil