aboutsummaryrefslogtreecommitdiffstats
path: root/libavformat
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-05-04 19:59:30 -0300
committerJames Almer <jamrial@gmail.com>2017-05-04 19:59:30 -0300
commit6fdd35a3126f6ecbe4ebab12bdf8867e4f544958 (patch)
tree7e0a89ba5a5e99377ec5461e9946ff1a0003a545 /libavformat
parentc0f17a905f3588bf61ba6d86a83c6835d431ed3d (diff)
parent92db5083077a8b0f8e1050507671b456fd155125 (diff)
downloadffmpeg-6fdd35a3126f6ecbe4ebab12bdf8867e4f544958.tar.gz
Merge commit '92db5083077a8b0f8e1050507671b456fd155125'
* commit '92db5083077a8b0f8e1050507671b456fd155125': build: Generate pkg-config files from Make and not from configure build: Store library version numbers in .version files Includes cherry-picked commits 8a34f3659371680ca523aecfd9098c28f0f809eb and ee164727dd64c199b87118917e674b17c25e0da3 to fix issues. Changes were also made to retain support for raise_major and build_suffix. Reviewed-by: ubitux Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/Makefile3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/Makefile b/libavformat/Makefile
index d82639d123..4e169fdce5 100644
--- a/libavformat/Makefile
+++ b/libavformat/Makefile
@@ -1,6 +1,5 @@
-include $(SUBDIR)../ffbuild/config.mak
-
NAME = avformat
+DESC = FFmpeg container format library
HEADERS = avformat.h \
avio.h \