diff mbox series

[2/2] package/ffmpeg: add optional support for openjpeg

Message ID 20171218062911.14366-2-bernd.kuhls@t-online.de
State Accepted
Headers show
Series [1/2] package/ffmpeg: bump version to 3.4.1 | expand

Commit Message

Bernd Kuhls Dec. 18, 2017, 6:29 a.m. UTC 
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
---
 package/ffmpeg/ffmpeg.mk | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 5bb5d1e30e..daa6daba1b 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -53,7 +53,6 @@  FFMPEG_CONF_OPTS = \
 	--disable-libdc1394 \
 	--disable-libgsm \
 	--disable-libilbc \
-	--disable-libopenjpeg \
 	--disable-libvo-amrwbenc \
 	--disable-symver \
 	--disable-doc
@@ -369,6 +368,13 @@  else
 FFMPEG_CONF_OPTS += --disable-fontconfig
 endif
 
+ifeq ($(BR2_PACKAGE_OPENJPEG),y)
+FFMPEG_CONF_OPTS += --enable-libopenjpeg
+FFMPEG_DEPENDENCIES += openjpeg
+else
+FFMPEG_CONF_OPTS += --disable-libopenjpeg
+endif
+
 ifeq ($(BR2_PACKAGE_X264)$(BR2_PACKAGE_FFMPEG_GPL),yy)
 FFMPEG_CONF_OPTS += --enable-libx264
 FFMPEG_DEPENDENCIES += x264