]> git.sesse.net Git - ffmpeg/commit
Merge commit '92db5083077a8b0f8e1050507671b456fd155125'
authorJames Almer <jamrial@gmail.com>
Thu, 4 May 2017 22:59:30 +0000 (19:59 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 4 May 2017 22:59:30 +0000 (19:59 -0300)
commit6fdd35a3126f6ecbe4ebab12bdf8867e4f544958
tree7e0a89ba5a5e99377ec5461e9946ff1a0003a545
parentc0f17a905f3588bf61ba6d86a83c6835d431ed3d
parent92db5083077a8b0f8e1050507671b456fd155125
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>
16 files changed:
Makefile
configure
ffbuild/.gitignore
ffbuild/common.mak
ffbuild/library.mak
ffbuild/libversion.sh
ffbuild/pkgconfig_generate.sh
libavcodec/Makefile
libavdevice/Makefile
libavfilter/Makefile
libavformat/Makefile
libavresample/Makefile
libavutil/Makefile
libpostproc/Makefile
libswresample/Makefile
libswscale/Makefile