aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-05-28 15:36:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-06-07 00:55:23 +0200
commit1e78d75d6a73aa0a75859fb7ba48778e360785a8 (patch)
tree060980a384c0f1d37b2894de86bf578b12b865c3
parent91fdba3d79c94f9ee187b602e0f7e9522e996bd9 (diff)
downloadffmpeg-1e78d75d6a73aa0a75859fb7ba48778e360785a8.tar.gz
configure: openssl is compatible with the LGPL.
looking at the license i cannot see why they would be incompatible and researching this matter a bit also turned up no reasons. If i missed something, please dont hesitate to flame me and or revert Signed-off-by: Michael Niedermayer <michaelni@gmx.at> (cherry picked from commit f997ac1c8bc2124c4c6bf33ad17bc6f6cca0f84e) Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure b/configure
index 89098fdd5a..8718ff6f14 100755
--- a/configure
+++ b/configure
@@ -2862,7 +2862,7 @@ die_license_disabled gpl x11grab
die_license_disabled nonfree libaacplus
die_license_disabled nonfree libfaac
-die_license_disabled nonfree openssl
+enabled gpl && die_license_disabled nonfree openssl
die_license_disabled version3 libopencore_amrnb
die_license_disabled version3 libopencore_amrwb