Skip to content

Commit a6c4a03

Browse files
committed
Fix ffmpeg installation for mac
1 parent 2bd1fe2 commit a6c4a03

File tree

5 files changed

+1295
-10
lines changed

5 files changed

+1295
-10
lines changed

binding.gyp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"targets": [{
33
"target_name" : "beamcoder",
4-
"sources" : [ "src/beamcoder.cc", "src/beamcoder_util.cc",
4+
"sources" : [ "src/beamcoder.cc", "src/beamcoder_util.cc",
55
"src/log.cc" ,
66
"src/governor.cc", "src/demux.cc",
77
"src/decode.cc", "src/filter.cc",
@@ -90,10 +90,10 @@
9090
}],
9191
['OS=="mac"', {
9292
"include_dirs" : [
93-
"/opt/homebrew/Cellar/ffmpeg/5.0/include"
93+
"/usr/local/Cellar/ffmpeg@5/5.1.3/include/"
9494
],
9595
"library_dirs": [
96-
"/opt/homebrew/Cellar/ffmpeg/5.0/lib",
96+
"/usr/local/Cellar/ffmpeg@5/5.1.3/lib/",
9797
]
9898
}],
9999
]

install_ffmpeg.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ async function win32() {
9999
if (e.code === 'EEXIST') return;
100100
else throw e;
101101
});
102-
102+
103103
const ffmpegFilename = 'ffmpeg-5.x-win64-shared';
104104
await access(`ffmpeg/${ffmpegFilename}`, fs.constants.R_OK).catch(async () => {
105105
const html = await getHTML('https://github.com/BtbN/FFmpeg-Builds/wiki/Latest', 'latest autobuilds');
@@ -180,20 +180,20 @@ async function darwin() {
180180
console.log('Checking for FFmpeg dependencies via HomeBrew.');
181181
let output;
182182
let returnMessage;
183-
183+
184184
try {
185-
output = await exec('brew list ffmpeg');
185+
output = await exec('brew list ffmpeg@5');
186186
returnMessage = 'FFmpeg already present via Homebrew.';
187187
} catch (err) {
188-
if (err.stderr !== 'Error: No such keg: /usr/local/Cellar/ffmpeg\n') {
188+
if (err.stderr !== 'Error: No such keg: /usr/local/Cellar/ffmpeg@5\n') {
189189
console.error(err);
190190
console.log('Either Homebrew is not installed or something else is wrong.\nExiting');
191191
process.exit(1);
192192
}
193193

194194
console.log('FFmpeg not installed. Attempting to install via Homebrew.');
195195
try {
196-
output = await exec('brew install nasm pkg-config texi2html ffmpeg');
196+
output = await exec('brew install nasm pkg-config texi2html ffmpeg@5');
197197
returnMessage = 'FFmpeg installed via Homebrew.';
198198
} catch (err) {
199199
console.log('Failed to install ffmpeg:\n');

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "beamcoder",
2+
"name": "@antoinemopa/beamcoder",
33
"version": "0.7.1",
44
"description": "Node.js native bindings to FFmpeg.",
55
"main": "index.js",

0 commit comments

Comments
 (0)