summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/ffmpeg/ffmpeg.mk5
1 files changed, 5 insertions, 0 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 2168785246..e60ced740b 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -198,8 +198,13 @@ FFMPEG_CONF_OPT += --disable-bzlib
endif
ifeq ($(BR2_PACKAGE_OPENSSL),y)
+# openssl isn't license compatible with GPL
+ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
+FFMPEG_CONF_OPT += --disable-openssl
+else
FFMPEG_CONF_OPT += --enable-openssl
FFMPEG_DEPENDENCIES += openssl
+endif
else
FFMPEG_CONF_OPT += --disable-openssl
endif
OpenPOWER on IntegriCloud