Skip to content

Commit 77173c1

Browse files
authored
Merge pull request #854 from th-ch/bump-ffmpeg
Bump FFMpeg
2 parents d761d92 + be3a288 commit 77173c1

File tree

3 files changed

+17
-11
lines changed

3 files changed

+17
-11
lines changed

package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,8 @@
9494
},
9595
"dependencies": {
9696
"@cliqz/adblocker-electron": "^1.23.9",
97-
"@ffmpeg/core": "^0.10.0",
98-
"@ffmpeg/ffmpeg": "^0.10.1",
97+
"@ffmpeg/core": "^0.11.0",
98+
"@ffmpeg/ffmpeg": "^0.11.0",
9999
"Simple-YouTube-Age-Restriction-Bypass": "https://gitpkg.now.sh/zerodytrash/Simple-YouTube-Age-Restriction-Bypass/dist?v2.4.6",
100100
"async-mutex": "^0.3.2",
101101
"browser-id3-writer": "^4.4.0",

plugins/downloader/youtube-dl.js

+6
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@ const { ipcRenderer } = require("electron");
66
const is = require("electron-is");
77
const filenamify = require("filenamify");
88

9+
// Workaround for "Automatic publicPath is not supported in this browser"
10+
// See https://github.com/cypress-io/cypress/issues/18435#issuecomment-1048863509
11+
const script = document.createElement("script");
12+
document.body.appendChild(script);
13+
script.src = " "; // single space and not the empty string
14+
915
// Browser version of FFmpeg (in renderer process) instead of loading @ffmpeg/ffmpeg
1016
// because --js-flags cannot be passed in the main process when the app is packaged
1117
// See https://github.com/electron/electron/issues/22705

yarn.lock

+9-9
Original file line numberDiff line numberDiff line change
@@ -359,15 +359,15 @@
359359
minimatch "^3.0.4"
360360
strip-json-comments "^3.1.1"
361361

362-
"@ffmpeg/core@^0.10.0":
363-
version "0.10.0"
364-
resolved "https://registry.yarnpkg.com/@ffmpeg/core/-/core-0.10.0.tgz#f6a58361b22d7c23c6f7071b9fff6d572bc3f499"
365-
integrity sha512-qunWJl5PezpXEm31tb8Qu5z37B5KVA1VYZCpXchMhuAb3X9T7PuE3SlhOwphEoRhzaOa3lpofDfzihAUMFaVPQ==
366-
367-
"@ffmpeg/ffmpeg@^0.10.1":
368-
version "0.10.1"
369-
resolved "https://registry.yarnpkg.com/@ffmpeg/ffmpeg/-/ffmpeg-0.10.1.tgz#3dacf3985de9c83a95fbf79fe709920cc009b00a"
370-
integrity sha512-ChQkH7Rh57hmVo1LhfQFibWX/xqneolJKSwItwZdKPcLZuKigtYAYDIvB55pDfP17VtR1R77SxgkB2/UApB+Og==
362+
"@ffmpeg/core@^0.11.0":
363+
version "0.11.0"
364+
resolved "https://registry.yarnpkg.com/@ffmpeg/core/-/core-0.11.0.tgz#fc24fe5af587f83cd2575d0e45de455d8eed9ba9"
365+
integrity sha512-9Tt/+2PMpkGPXUK8n6He9G8Y+qR6qmCPSCw9iEKZxHHOvJ9BE/r0Fccj+YgDZTlyu6rXxc9x6EqCaFBIt7qzjA==
366+
367+
"@ffmpeg/ffmpeg@^0.11.0":
368+
version "0.11.5"
369+
resolved "https://registry.yarnpkg.com/@ffmpeg/ffmpeg/-/ffmpeg-0.11.5.tgz#841ab8f0d7298b343723e5616a2f64ee443d2b2d"
370+
integrity sha512-btdfI4bJ7Whqi10GJPcvvIfg22sN9LU5qw7Dbmpqts12enYEWWym+i1TBj1emvwIkDa2yxr61P2HECaELQWjGA==
371371
dependencies:
372372
is-url "^1.2.4"
373373
node-fetch "^2.6.1"

0 commit comments

Comments
 (0)