aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-07-13 00:51:01 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-07-13 00:51:01 +0200
commit81fe2e8b366e59bc12e0a2d7db3debdfb70c5a9e (patch)
treedb4d67794c127d04a946fc18d27b51bd6ecd35ca /configure
parent620c6292b1a7cdaaa3e258c899b37e68954589b8 (diff)
downloadffmpeg-81fe2e8b366e59bc12e0a2d7db3debdfb70c5a9e.tar.gz
build_system: mark libfdk as non GPL compatible until the situation is clarified by someone qualified.
The license fee text may be interpreted as a additional restriction in the GPL sense. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure1
1 files changed, 1 insertions, 0 deletions
diff --git a/configure b/configure
index 76626557e4..a6760d4542 100755
--- a/configure
+++ b/configure
@@ -2928,6 +2928,7 @@ die_license_disabled gpl x11grab
die_license_disabled nonfree libaacplus
die_license_disabled nonfree libfaac
enabled gpl && die_license_disabled_gpl nonfree openssl
+enabled gpl && die_license_disabled_gpl nonfree libfdk_aac
die_license_disabled version3 libopencore_amrnb
die_license_disabled version3 libopencore_amrwb