From 2b57f536e626647d82711e656f55db1c332b0d81 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Thu, 15 Dec 2022 12:38:45 +0300 Subject: [PATCH] Use ffmpeg instead of opencv_ffmpeg everywhere. --- travis_config.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/travis_config.sh b/travis_config.sh index 465baf7..e0ba15e 100644 --- a/travis_config.sh +++ b/travis_config.sh @@ -50,12 +50,12 @@ if [ -n "$IS_OSX" ]; then BREW_SLOW_BUILIDING_PACKAGES=$(printf '%s\n' \ "cmake 15" \ - "ffmpeg_opencv 10" \ + "ffmpeg 10" \ ) function generate_ffmpeg_formula { local FF="ffmpeg" - local LFF="ffmpeg_opencv" + local LFF="ffmpeg" local FF_FORMULA; FF_FORMULA=$(brew formula "${FF}") local LFF_FORMULA; LFF_FORMULA="$(dirname "$FF_FORMULA")/${LFF}.rb" @@ -117,9 +117,9 @@ function pre_build { brew update generate_ffmpeg_formula brew_add_local_bottles - brew install --build-bottle ffmpeg_opencv + brew install --build-bottle ffmpeg # It needs when we use not the latest ffmpeg formula - brew link ffmpeg_opencv + brew link ffmpeg if [ -n "$CACHE_STAGE" ]; then brew_go_bootstrap_mode 0 -- GitLab