summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernd Kuhls <bernd.kuhls@t-online.de>2016-09-05 16:51:20 +0200
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-09-06 21:39:22 +0200
commit1b69855b69118622d4048b6b744df0ee2ba29b5b (patch)
tree6fe4e60c1c0b1772178f754762a4273fd1082a83
parent35387e190c1fdf6ea28055468fec05ea7ea03e4e (diff)
downloadbuildroot-1b69855b69118622d4048b6b744df0ee2ba29b5b.tar.gz
buildroot-1b69855b69118622d4048b6b744df0ee2ba29b5b.zip
package/ffmpeg: add optional support for opencv3
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/ffmpeg/ffmpeg.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index a90d437e4f..782d913e68 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -253,6 +253,9 @@ endif
ifeq ($(BR2_PACKAGE_OPENCV_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV_WITH_FFMPEG),yx)
FFMPEG_CONF_OPTS += --enable-libopencv
FFMPEG_DEPENDENCIES += opencv
+else ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx)
+FFMPEG_CONF_OPTS += --enable-libopencv
+FFMPEG_DEPENDENCIES += opencv3
else
FFMPEG_CONF_OPTS += --disable-libopencv
endif
OpenPOWER on IntegriCloud