]> git.sesse.net Git - ffmpeg/commit
projects / ffmpeg / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0052f3f ae90119)
Merge commit 'ae90119c6701fa09ff747cca35238e36b2d2ab2f'
authorClément Bœsch <u@pkh.me>
Wed, 15 Mar 2017 20:09:06 +0000 (21:09 +0100)
committerClément Bœsch <u@pkh.me>
Wed, 15 Mar 2017 20:19:57 +0000 (21:19 +0100)
commit9f28db47accb31bfec40a56dd2dc19ffd366a6be
treed80cac8427ca18c72189c85ba25b331829757783tree | snapshot
parent0052f3f527c4558d32b4f710063acb096493d99ccommit | diff
parentae90119c6701fa09ff747cca35238e36b2d2ab2fcommit | diff
Merge commit 'ae90119c6701fa09ff747cca35238e36b2d2ab2f'

* commit 'ae90119c6701fa09ff747cca35238e36b2d2ab2f':
  configure: Simplify license incompatibility check

An extra GPLV3 list is added for libsmbclient as having it in both GPL
and VERSION3 lists would cause a duplicate in the final config list.

Also, for consistency, libnpp is treated the same as the other nonfree
component (libfdk_aac and openssl).

Merged-by: Clément Bœsch <u@pkh.me>
configure diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.