aboutsummaryrefslogtreecommitdiff
path: root/package/ffmpeg/ffmpeg.mk
diff options
context:
space:
mode:
Diffstat (limited to 'package/ffmpeg/ffmpeg.mk')
-rw-r--r--package/ffmpeg/ffmpeg.mk14
1 files changed, 10 insertions, 4 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk
index 1b311ebaea..6d28bfbed7 100644
--- a/package/ffmpeg/ffmpeg.mk
+++ b/package/ffmpeg/ffmpeg.mk
@@ -16,6 +16,8 @@ FFMPEG_LICENSE += and GPL-2.0+
FFMPEG_LICENSE_FILES += COPYING.GPLv2
endif
+FFMPEG_CPE_ID_VENDOR = ffmpeg
+
FFMPEG_CONF_OPTS = \
--prefix=/usr \
--enable-avfilter \
@@ -84,6 +86,13 @@ else
FFMPEG_CONF_OPTS += --disable-ffplay
endif
+ifeq ($(BR2_PACKAGE_LIBV4L),y)
+FFMPEG_DEPENDENCIES += libv4l
+FFMPEG_CONF_OPTS += --enable-libv4l2
+else
+FFMPEG_CONF_OPTS += --disable-libv4l2
+endif
+
ifeq ($(BR2_PACKAGE_FFMPEG_AVRESAMPLE),y)
FFMPEG_CONF_OPTS += --enable-avresample
else
@@ -282,10 +291,7 @@ endif
# To avoid a circular dependency only use opencv if opencv itself does
# not depend on ffmpeg.
-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)
+ifeq ($(BR2_PACKAGE_OPENCV3_LIB_IMGPROC)x$(BR2_PACKAGE_OPENCV3_WITH_FFMPEG),yx)
FFMPEG_CONF_OPTS += --enable-libopencv
FFMPEG_DEPENDENCIES += opencv3
else