diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-13 23:36:14 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-14 00:40:32 +0400 |
commit | 3d7218d932923e2b964fef37e8993fd0a6df7c1d (patch) | |
tree | 8d84104fd947b896e3879276a85c0f98f80fa191 /libavformat/Makefile | |
parent | d90ba411aba28ebaced788f0810e082d9525bc13 (diff) | |
parent | 449511740f06a4675b0066730fa45cdb764ffafc (diff) |
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 'libavformat/Makefile')
-rw-r--r-- | libavformat/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile index 457a69f914..00358e771b 100644 --- a/libavformat/Makefile +++ b/libavformat/Makefile @@ -1,7 +1,6 @@ include $(SUBDIR)../config.mak NAME = avformat -FFLIBS = avcodec avutil HEADERS = avformat.h \ avio.h \ |