Message ID | 1471273421-12076-4-git-send-email-bernd.kuhls@t-online.de |
---|---|
State | Accepted |
Headers | show |
Hello, On Mon, 15 Aug 2016 17:03:39 +0200, Bernd Kuhls wrote: > ffmpeg only needs the imgproc module of opencv: > https://github.com/FFmpeg/FFmpeg/commit/15708f13477aaf2effdc0d7fc727507bc468335a > > Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Applied to next. However: what about opencv3 support? Thanks! Thomas
Am Fri, 26 Aug 2016 21:46:51 +0200 schrieb Thomas Petazzoni: > Hello, > > On Mon, 15 Aug 2016 17:03:39 +0200, Bernd Kuhls wrote: >> ffmpeg only needs the imgproc module of opencv: >> https://github.com/FFmpeg/FFmpeg/commit/15708f13477aaf2effdc0d7fc727507bc468335a >> >> Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> > > Applied to next. However: what about opencv3 support? Hi Thomas, according to ffmpeg/configure it only checks for opencv2: http://git.videolan.org/?p=ffmpeg.git;a=blobdiff;f=configure;h=f28aa8ff66181e0025debd7480d3ad6e63e415ff;hp=f4b821ad313f1640b2698ef2ed5928ce24eca8f1;hb=15708f13477aaf2effdc0d7fc727507bc468335a;hpb=b70e9b4906a3d1a61c542da02793decba1dbabba Regards, Bernd
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index 154a091..1f2d1df 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -48,7 +48,6 @@ FFMPEG_CONF_OPTS = \ --disable-frei0r \ --disable-libopencore-amrnb \ --disable-libopencore-amrwb \ - --disable-libopencv \ --disable-libcdio \ --disable-libdc1394 \ --disable-libfaac \ @@ -249,6 +248,15 @@ else FFMPEG_CONF_OPTS += --disable-vdpau 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 +FFMPEG_CONF_OPTS += --disable-libopencv +endif + ifeq ($(BR2_PACKAGE_OPUS),y) FFMPEG_CONF_OPTS += --enable-libopus FFMPEG_DEPENDENCIES += opus
ffmpeg only needs the imgproc module of opencv: https://github.com/FFmpeg/FFmpeg/commit/15708f13477aaf2effdc0d7fc727507bc468335a Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> --- v5: no changes v4: first release package/ffmpeg/ffmpeg.mk | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-)