aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/Makefile
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-13 21:36:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-13 22:40:32 +0200
commit3d7218d932923e2b964fef37e8993fd0a6df7c1d (patch)
tree8d84104fd947b896e3879276a85c0f98f80fa191 /libavcodec/Makefile
parentd90ba411aba28ebaced788f0810e082d9525bc13 (diff)
parent449511740f06a4675b0066730fa45cdb764ffafc (diff)
downloadffmpeg-3d7218d932923e2b964fef37e8993fd0a6df7c1d.tar.gz
Merge commit '449511740f06a4675b0066730fa45cdb764ffafc'
* commit '449511740f06a4675b0066730fa45cdb764ffafc': build: handle library dependencies in configure Conflicts: common.mak configure libavdevice/Makefile libavfilter/Makefile Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/Makefile')
-rw-r--r--libavcodec/Makefile1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index 463e1a92c1..34544de882 100644
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -1,7 +1,6 @@
include $(SUBDIR)../config.mak
NAME = avcodec
-FFLIBS = avutil
HEADERS = avcodec.h \
avfft.h \