Skip to content

Commit 9016768

Browse files
committed
chore: upgrade dependencies to FFmpeg 4.4 - fixes broken build
1 parent 01e431c commit 9016768

File tree

5 files changed

+36
-35
lines changed

5 files changed

+36
-35
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,6 @@
5353
"xtr1common": "cpp",
5454
"xtree": "cpp",
5555
"xutility": "cpp"
56-
}
56+
},
57+
"cmake.configureOnOpen": false
5758
}

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.3-win64-shared/include"
48+
"ffmpeg/ffmpeg-4.4-win64-shared/include"
4949
],
5050
"libraries": [
51-
"-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/avcodec",
52-
"-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/avdevice",
53-
"-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/avfilter",
54-
"-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/avformat",
55-
"-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/avutil",
56-
"-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/postproc",
57-
"-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/swresample",
58-
"-l../ffmpeg/ffmpeg-4.3-win64-shared/lib/swscale"
51+
"-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/avcodec",
52+
"-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/avdevice",
53+
"-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/avfilter",
54+
"-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/avformat",
55+
"-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/avutil",
56+
"-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/postproc",
57+
"-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/swresample",
58+
"-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/swscale"
5959
],
6060
"copies": [
6161
{
6262
"destination": "build/Release/",
6363
"files": [
64-
"ffmpeg/ffmpeg-4.3-win64-shared/bin/avcodec-58.dll",
65-
"ffmpeg/ffmpeg-4.3-win64-shared/bin/avdevice-58.dll",
66-
"ffmpeg/ffmpeg-4.3-win64-shared/bin/avfilter-7.dll",
67-
"ffmpeg/ffmpeg-4.3-win64-shared/bin/avformat-58.dll",
68-
"ffmpeg/ffmpeg-4.3-win64-shared/bin/avutil-56.dll",
69-
"ffmpeg/ffmpeg-4.3-win64-shared/bin/postproc-55.dll",
70-
"ffmpeg/ffmpeg-4.3-win64-shared/bin/swresample-3.dll",
71-
"ffmpeg/ffmpeg-4.3-win64-shared/bin/swscale-5.dll"
64+
"ffmpeg/ffmpeg-4.4-win64-shared/bin/avcodec-58.dll",
65+
"ffmpeg/ffmpeg-4.4-win64-shared/bin/avdevice-58.dll",
66+
"ffmpeg/ffmpeg-4.4-win64-shared/bin/avfilter-7.dll",
67+
"ffmpeg/ffmpeg-4.4-win64-shared/bin/avformat-58.dll",
68+
"ffmpeg/ffmpeg-4.4-win64-shared/bin/avutil-56.dll",
69+
"ffmpeg/ffmpeg-4.4-win64-shared/bin/postproc-55.dll",
70+
"ffmpeg/ffmpeg-4.4-win64-shared/bin/swresample-3.dll",
71+
"ffmpeg/ffmpeg-4.4-win64-shared/bin/swscale-5.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.3-win64-shared';
103+
const ffmpegFilename = 'ffmpeg-4.4-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.3');
110+
const sharedEndPos = autoStr.lastIndexOf('">win64-gpl-shared-4.4');
111111
const startStr = '<p><a href="';
112112
const sharedStartPos = autoStr.lastIndexOf(startStr, sharedEndPos) + startStr.length;
113113
const downloadSource = autoStr.substring(sharedStartPos, sharedEndPos);

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.

src/codec.cc

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4872,10 +4872,10 @@ napi_value getCodecCtxDebug(napi_env env, napi_callback_info info) {
48724872
status = beam_set_bool(env, result, "BUGS", codec->debug & FF_DEBUG_BUGS);
48734873
CHECK_STATUS;
48744874
#if FF_API_DEBUG_MV
4875-
status = beam_set_bool(env, result, "VIS_QP", codec->debug & FF_DEBUG_VIS_QP);
4876-
CHECK_STATUS;
4877-
status = beam_set_bool(env, result, "VIS_MB_TYPE", codec->debug & FF_DEBUG_VIS_MB_TYPE);
4878-
CHECK_STATUS;
4875+
// status = beam_set_bool(env, result, "VIS_QP", codec->debug & FF_DEBUG_VIS_QP);
4876+
// CHECK_STATUS;
4877+
// status = beam_set_bool(env, result, "VIS_MB_TYPE", codec->debug & FF_DEBUG_VIS_MB_TYPE);
4878+
// CHECK_STATUS;
48794879
#endif
48804880
status = beam_set_bool(env, result, "BUFFERS", codec->debug & FF_DEBUG_BUFFERS);
48814881
CHECK_STATUS;
@@ -4964,16 +4964,16 @@ napi_value setCodecCtxDebug(napi_env env, napi_callback_info info) {
49644964
codec->debug | FF_DEBUG_BUGS :
49654965
codec->debug & ~FF_DEBUG_BUGS; }
49664966
#if FF_API_DEBUG_MV
4967-
status = beam_get_bool(env, args[0], "VIS_QP", &present, &flag);
4968-
CHECK_STATUS;
4969-
if (present) { codec->debug = (flag) ?
4970-
codec->debug | FF_DEBUG_VIS_QP :
4971-
codec->debug & ~FF_DEBUG_VIS_QP; }
4972-
status = beam_get_bool(env, args[0], "VIS_MB_TYPE", &present, &flag);
4973-
CHECK_STATUS;
4974-
if (present) { codec->debug = (flag) ?
4975-
codec->debug | FF_DEBUG_VIS_MB_TYPE :
4976-
codec->debug & ~FF_DEBUG_VIS_MB_TYPE; }
4967+
// status = beam_get_bool(env, args[0], "VIS_QP", &present, &flag);
4968+
// CHECK_STATUS;
4969+
// if (present) { codec->debug = (flag) ?
4970+
// codec->debug | FF_DEBUG_VIS_QP :
4971+
// codec->debug & ~FF_DEBUG_VIS_QP; }
4972+
// status = beam_get_bool(env, args[0], "VIS_MB_TYPE", &present, &flag);
4973+
// CHECK_STATUS;
4974+
// if (present) { codec->debug = (flag) ?
4975+
// codec->debug | FF_DEBUG_VIS_MB_TYPE :
4976+
// codec->debug & ~FF_DEBUG_VIS_MB_TYPE; }
49774977
#endif
49784978
status = beam_get_bool(env, args[0], "BUFFERS", &present, &flag);
49794979
CHECK_STATUS;

0 commit comments

Comments
 (0)