diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-15 21:09:06 +0100 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-15 21:19:57 +0100 |
| commit | 9f28db47accb31bfec40a56dd2dc19ffd366a6be (patch) | |
| tree | d80cac8427ca18c72189c85ba25b331829757783 /libavutil/display.c | |
| parent | 0052f3f527c4558d32b4f710063acb096493d99c (diff) | |
| parent | ae90119c6701fa09ff747cca35238e36b2d2ab2f (diff) | |
| download | ffmpeg-9f28db47accb31bfec40a56dd2dc19ffd366a6be.tar.gz | |
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>
Diffstat (limited to 'libavutil/display.c')
0 files changed, 0 insertions, 0 deletions