From 8a1d9e27ae2d63c180a517b54c4a8ba29a54998c Mon Sep 17 00:00:00 2001 From: philippegorley <philippe.gorley@savoirfairelinux.com> Date: Wed, 8 Aug 2018 15:23:11 -0400 Subject: [PATCH] ffmpeg: add libswresample check Adds libswresample to the package check. Namely, we don't want to use libavresample, which has a different API. The latter exists solely for compatibility with Libav. Change-Id: I717975c696e2de2787be98cac07862215095b667 --- contrib/src/ffmpeg/rules.mak | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak index 20b9fe45b9..119ffb6a3f 100644 --- a/contrib/src/ffmpeg/rules.mak +++ b/contrib/src/ffmpeg/rules.mak @@ -3,7 +3,7 @@ FFMPEG_URL := https://git.ffmpeg.org/gitweb/ffmpeg.git/snapshot/$(FFMPEG_HASH).t PKGS+=ffmpeg -ifeq ($(call need_pkg,"libavutil >= 55.75.100 libavcodec >= 57.106.101 libavformat >= 57.82.100 libavdevice >= 57.8.101 libavfilter >= 6.105.100 libswscale >= 4.7.103"),) +ifeq ($(call need_pkg,"libavutil >= 55.75.100 libavcodec >= 57.106.101 libavformat >= 57.82.100 libavdevice >= 57.8.101 libavfilter >= 6.105.100 libswscale >= 4.7.103 libswresample >= 2.9.100"),) PKGS_FOUND += ffmpeg endif -- GitLab