Skip to content

Commit b54852d

Browse files
scriptorianscriptorian
committed
Update to FFmpeg 5
1 parent 5504d7b commit b54852d

File tree

14 files changed

+1931
-261
lines changed

14 files changed

+1931
-261
lines changed

‎.vscode/c_cpp_properties.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,8 @@
88
"C:/Program Files (x86)/Windows Kits/10/Include/10.0.10240.0/ucrt",
99
"C:/Program Files (x86)/Windows Kits/8.1/Include/shared",
1010
"C:/Program Files (x86)/Windows Kits/8.1/Include/winrt",
11-
"${workspaceFolder}/**",
12-
"${workspaceFolder}/ffmpeg/ffmpeg-4.x-win64-shared/include/**",
13-
"${env:USERPROFILE}/AppData/Local/node-gyp/Cache/12.21.0/include/node"
11+
"${workspaceFolder}/ffmpeg/ffmpeg-5.x-win64-shared/include/**",
12+
"${env:USERPROFILE}/AppData/Local/node-gyp/Cache/16.14.0/include/node"
1413
],
1514
"defines": [
1615
"_DEBUG",

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ This will install all necessary dependencies, download the FFmpeg shared and dev
9292

9393
Note that if you want to use a local version of FFmpeg then, before the install, symbolic link or copy appropriate folders to:
9494

95-
./node_modules/beamcoder/ffmpeg/ffmpeg-4.x-win64-shared
95+
./node_modules/beamcoder/ffmpeg/ffmpeg-5.x-win64-shared
9696

9797
To ensure that sufficient threads are available to process several requests in parallel, set the `UV_THREADPOOL_SIZE` environment variable, e.g.:
9898

‎binding.gyp‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -45,30 +45,30 @@
4545
}
4646
},
4747
"include_dirs" : [
48-
"ffmpeg/ffmpeg-4.x-win64-shared/include"
48+
"ffmpeg/ffmpeg-5.x-win64-shared/include"
4949
],
5050
"libraries": [
51-
"-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avcodec",
52-
"-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avdevice",
53-
"-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avfilter",
54-
"-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avformat",
55-
"-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avutil",
56-
"-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/postproc",
57-
"-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/swresample",
58-
"-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/swscale"
51+
"-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/avcodec",
52+
"-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/avdevice",
53+
"-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/avfilter",
54+
"-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/avformat",
55+
"-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/avutil",
56+
"-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/postproc",
57+
"-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/swresample",
58+
"-l../ffmpeg/ffmpeg-5.x-win64-shared/lib/swscale"
5959
],
6060
"copies": [
6161
{
6262
"destination": "build/Release/",
6363
"files": [
64-
"ffmpeg/ffmpeg-4.x-win64-shared/bin/avcodec-58.dll",
65-
"ffmpeg/ffmpeg-4.x-win64-shared/bin/avdevice-58.dll",
66-
"ffmpeg/ffmpeg-4.x-win64-shared/bin/avfilter-7.dll",
67-
"ffmpeg/ffmpeg-4.x-win64-shared/bin/avformat-58.dll",
68-
"ffmpeg/ffmpeg-4.x-win64-shared/bin/avutil-56.dll",
69-
"ffmpeg/ffmpeg-4.x-win64-shared/bin/postproc-55.dll",
70-
"ffmpeg/ffmpeg-4.x-win64-shared/bin/swresample-3.dll",
71-
"ffmpeg/ffmpeg-4.x-win64-shared/bin/swscale-5.dll"
64+
"ffmpeg/ffmpeg-5.x-win64-shared/bin/avcodec-59.dll",
65+
"ffmpeg/ffmpeg-5.x-win64-shared/bin/avdevice-59.dll",
66+
"ffmpeg/ffmpeg-5.x-win64-shared/bin/avfilter-8.dll",
67+
"ffmpeg/ffmpeg-5.x-win64-shared/bin/avformat-59.dll",
68+
"ffmpeg/ffmpeg-5.x-win64-shared/bin/avutil-57.dll",
69+
"ffmpeg/ffmpeg-5.x-win64-shared/bin/postproc-56.dll",
70+
"ffmpeg/ffmpeg-5.x-win64-shared/bin/swresample-4.dll",
71+
"ffmpeg/ffmpeg-5.x-win64-shared/bin/swscale-6.dll"
7272
]
7373
}
7474
]

‎install_ffmpeg.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -100,14 +100,14 @@ async function win32() {
100100
else throw e;
101101
});
102102

103-
const ffmpegFilename = 'ffmpeg-4.x-win64-shared';
103+
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');
106106
const htmlStr = html.toString('utf-8');
107107
const autoPos = htmlStr.indexOf('<p><a href=');
108108
const endPos = htmlStr.indexOf('</div>', autoPos);
109109
const autoStr = htmlStr.substring(autoPos, endPos);
110-
const sharedEndPos = autoStr.lastIndexOf('">win64-gpl-shared-4.');
110+
const sharedEndPos = autoStr.lastIndexOf('">win64-gpl-shared-5.');
111111
if (sharedEndPos === -1)
112112
throw new Error('Failed to find latest v4.x autobuild from "https://github.com/BtbN/FFmpeg-Builds/wiki/Latest"');
113113
const startStr = '<p><a href="';

0 commit comments

Comments
 (0)