summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-02-07 14:37:08 +0100
committerReinhard Tartler <siretart@tauware.de>2011-02-15 16:18:21 +0100
commit737eb5976f6a37703923ce3c3d5e6ca8eeabb43a (patch)
treeab13f1d9bc6e2d47882bb54c50f26f16ecdcf28b /Makefile
parent8ed4cc65a19b5a6cc7ae6ed5072be2d3836dbeb2 (diff)
Merge libavcore into libavutil
It is pretty hopeless that other considerable projects will adopt libavutil alone in other projects. Projects that need small footprint are better off with more specialized libraries such as gnulib or rather just copy the necessary parts that they need. With this in mind, nobody is helped by having libavutil and libavcore split. In order to ease maintenance inside and around FFmpeg and to reduce confusion where to put common code, avcore's functionality is merged (back) to avutil. Signed-off-by: Reinhard Tartler <siretart@tauware.de>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 99d264a446..4ed003b7a5 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,6 @@ FFLIBS-$(CONFIG_AVFORMAT) += avformat
FFLIBS-$(CONFIG_AVCODEC) += avcodec
FFLIBS-$(CONFIG_POSTPROC) += postproc
FFLIBS-$(CONFIG_SWSCALE) += swscale
-FFLIBS-$(CONFIG_AVCORE) += avcore
FFLIBS := avutil