summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorReinhard Tartler <siretart@tauware.de>2011-02-07 14:37:08 +0100
committerMichael Niedermayer <michaelni@gmx.at>2011-02-16 23:00:30 +0100
commit7ffe76e540297ad4df2896064f83cb1adbd81fd9 (patch)
tree4510accdfd282fafb4f8caae1055c76ebf45e4c0 /Makefile
parentfad8143f5b9689e0e2dafe46500d944cfa58a911 (diff)
Merge libavcore into libavutil
Done to keep ABI compatible. Otherwise this is just silly
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