summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/ffmpeg/ffmpeg.mk8
1 files changed, 7 insertions, 1 deletions
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
OpenPOWER on IntegriCloud