Skip to content

Commit 2b57f53

Browse files
committed
Use ffmpeg instead of opencv_ffmpeg everywhere.
1 parent d780d93 commit 2b57f53

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

travis_config.sh

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,12 @@ if [ -n "$IS_OSX" ]; then
5050

5151
BREW_SLOW_BUILIDING_PACKAGES=$(printf '%s\n' \
5252
"cmake 15" \
53-
"ffmpeg_opencv 10" \
53+
"ffmpeg 10" \
5454
)
5555

5656
function generate_ffmpeg_formula {
5757
local FF="ffmpeg"
58-
local LFF="ffmpeg_opencv"
58+
local LFF="ffmpeg"
5959
local FF_FORMULA; FF_FORMULA=$(brew formula "${FF}")
6060
local LFF_FORMULA; LFF_FORMULA="$(dirname "$FF_FORMULA")/${LFF}.rb"
6161

@@ -117,9 +117,9 @@ function pre_build {
117117
brew update
118118
generate_ffmpeg_formula
119119
brew_add_local_bottles
120-
brew install --build-bottle ffmpeg_opencv
120+
brew install --build-bottle ffmpeg
121121
# It needs when we use not the latest ffmpeg formula
122-
brew link ffmpeg_opencv
122+
brew link ffmpeg
123123

124124
if [ -n "$CACHE_STAGE" ]; then
125125
brew_go_bootstrap_mode 0

0 commit comments

Comments
 (0)