From: Bernd Kuhls Date: Mon, 5 Sep 2016 14:51:20 +0000 (+0200) Subject: package/ffmpeg: add optional support for opencv3 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1b69855b69118622d4048b6b744df0ee2ba29b5b;p=buildroot.git package/ffmpeg: add optional support for opencv3 Signed-off-by: Bernd Kuhls Signed-off-by: Thomas Petazzoni --- 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