Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
kribblo committed Jun 11, 2019
2 parents 52c9647 + bbe5c71 commit a2ed38c
Show file tree
Hide file tree
Showing 12 changed files with 34 additions and 22 deletions.
18 changes: 13 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,14 @@ ffmpeg.setFfmpegPath(ffmpegPath);

To automatically choose the binary to install, [optionalDependencies](https://docs.npmjs.com/files/package.json#optionaldependencies) are used. This currently outputs warnings in the console, an issue that is [tracked by the npm team here](https://github.com/npm/npm/issues/9567).

### AWS and/or Elastic Beanstalk

If you get permissions issues, try adding a .npmrc file with the following:

unsafe-perm=true

See [issue #21](https://github.com/kribblo/node-ffmpeg-installer/issues/21)

### Wrong path under Electron with Asar enabled

It's a [known issue](https://github.com/electron-userland/electron-packager/issues/740) that Asar breaks native paths. As a workaround, if you use Asar, you can do something like this:
Expand All @@ -52,11 +60,11 @@ const ffmpegPath = require('@ffmpeg-installer/ffmpeg').path.replace('app.asar',

Downloaded from the sources listed at [ffmpeg.org](https://ffmpeg.org/download.html):

* Linux 32-bit: (20181010-gf85fa100db): https://www.johnvansickle.com/ffmpeg/
* Linux 64-bit: (20181010-gf85fa100db): https://www.johnvansickle.com/ffmpeg/
* Mac OS/X (91158-g63c4a4b0d6): https://evermeet.cx/ffmpeg/
* Windows 32-bit (20180102-41e51fb): https://ffmpeg.zeranoe.com/builds/win32/static/
* Windows 64-bit (20180102-41e51fb): https://ffmpeg.zeranoe.com/builds/win64/static/
* Linux 32-bit: (20181210-g0e8eb07980): https://www.johnvansickle.com/ffmpeg/
* Linux 64-bit: (20181210-g0e8eb07980): https://www.johnvansickle.com/ffmpeg/
* Mac OS/X (92718-g092cb17983): https://evermeet.cx/ffmpeg/
* Windows 32-bit (20181217-f22fcd4): https://ffmpeg.zeranoe.com/builds/win32/static/
* Windows 64-bit (20181217-f22fcd4): https://ffmpeg.zeranoe.com/builds/win64/static/

For version updates, submit issue or pull request.

Expand Down
18 changes: 11 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,25 @@
"main": "index.js",
"scripts": {
"lint": "jshint *.js",
"preversion": "npm run lint"
"preversion": "npm run lint",
"upload": "npm --userconfig=.npmrc publish --access public"
},
"keywords": [
"ffmpeg",
"binary"
"binary",
"installer",
"audio",
"sound"
],
"author": "Kristoffer Lundén <[email protected]>",
"license": "LGPL-2.1",
"description": "Platform independent binary installer of FFmpeg for node projects",
"optionalDependencies": {
"@ffmpeg-installer/darwin-x64": "4.0.6",
"@ffmpeg-installer/linux-ia32": "4.0.5",
"@ffmpeg-installer/linux-x64": "4.0.5",
"@ffmpeg-installer/win32-ia32": "4.0.4",
"@ffmpeg-installer/win32-x64": "4.0.3"
"@ffmpeg-installer/darwin-x64": "4.1.0",
"@ffmpeg-installer/linux-ia32": "4.1.0",
"@ffmpeg-installer/linux-x64": "4.1.0",
"@ffmpeg-installer/win32-ia32": "4.1.0",
"@ffmpeg-installer/win32-x64": "4.1.0"
},
"devDependencies": {
"jshint": "^2.9.3"
Expand Down
Loading

0 comments on commit a2ed38c

Please sign in to comment.