diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index a3807731f496ffa3164c145d91b98f5aba1d0be1..82291fc6a5dddd79630670d8eebb5841130f4eb6 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -1,17 +1,7 @@ FFMPEG_HASH := n3.3.1 FFMPEG_URL := https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/$(FFMPEG_HASH).tar.gz -ifdef HAVE_WIN32 -PKGS += ffmpeg -endif - -ifdef HAVE_MACOSX -PKGS += ffmpeg -endif - -ifdef HAVE_LINUX -PKGS += ffmpeg -endif +PKGS+=ffmpeg ifeq ($(call need_pkg,"libavcodec >= 57.89.100 libavformat >= 57.71.100 libswscale >= 4.6.100 libavdevice >= 57.6.100 libavutil >= 55.58.100"),) PKGS_FOUND += ffmpeg diff --git a/contrib/src/libav/rules.mak b/contrib/src/libav/rules.mak index 307ff9f95f4d6a9460cfb5c0748d8ccd65047037..5f4eaf19069a471274d87546bdabebf7d1a3c53f 100644 --- a/contrib/src/libav/rules.mak +++ b/contrib/src/libav/rules.mak @@ -1,14 +1,6 @@ LIBAV_HASH := v12.1 LIBAV_URL := https://git.libav.org/?p=libav.git;a=snapshot;h=$(LIBAV_HASH);sf=tgz -ifndef HAVE_LINUX -ifndef HAVE_WIN32 -ifndef HAVE_MACOSX -PKGS += libav -endif -endif -endif - #disable everything #ensure to add this option first LIBAVCONF = \