Improved handling of FFmpeg minor version changes

Author: scriptorian

.vscode/c_cpp_properties.json

@@ -9,8 +9,8 @@
                 "C:/Program Files (x86)/Windows Kits/8.1/Include/shared",
                 "C:/Program Files (x86)/Windows Kits/8.1/Include/winrt",
                 "${workspaceFolder}/**",
-                "${workspaceFolder}/ffmpeg/ffmpeg-4.3.1-win64-shared/include/**",
-                "${env:USERPROFILE}/AppData/Local/node-gyp/Cache/12.18.2/include/node"
+                "${workspaceFolder}/ffmpeg/ffmpeg-4.x-win64-shared/include/**",
+                "${env:USERPROFILE}/AppData/Local/node-gyp/Cache/12.21.0/include/node"
             ],
             "defines": [
                 "_DEBUG",

README.md

@@ -92,8 +92,7 @@ This will install all necessary dependencies, download the FFmpeg shared and dev
 
 Note that if you want to use a local version of FFmpeg then, before the install, symbolic link or copy appropriate folders to:
 
-    ./node_modules/beamcoder/ffmpeg/ffmpeg-4.1-win64-shared
-    ./node_modules/beamcoder/ffmpeg/ffmpeg-4.1-win64-dev
+    ./node_modules/beamcoder/ffmpeg/ffmpeg-4.x-win64-shared
 
 To ensure that sufficient threads are available to process several requests in parallel, set the `UV_THREADPOOL_SIZE` environment variable, e.g.:
 

binding.gyp

@@ -45,30 +45,30 @@
           }
         },
         "include_dirs" : [
-          "ffmpeg/ffmpeg-4.4-win64-shared/include"
+          "ffmpeg/ffmpeg-4.x-win64-shared/include"
         ],
         "libraries": [
-          "-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/avcodec",
-          "-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/avdevice",
-          "-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/avfilter",
-          "-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/avformat",
-          "-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/avutil",
-          "-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/postproc",
-          "-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/swresample",
-          "-l../ffmpeg/ffmpeg-4.4-win64-shared/lib/swscale"
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avcodec",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avdevice",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avfilter",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avformat",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/avutil",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/postproc",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/swresample",
+          "-l../ffmpeg/ffmpeg-4.x-win64-shared/lib/swscale"
         ],
         "copies": [
             {
               "destination": "build/Release/",
               "files": [
-                "ffmpeg/ffmpeg-4.4-win64-shared/bin/avcodec-58.dll",
-                "ffmpeg/ffmpeg-4.4-win64-shared/bin/avdevice-58.dll",
-                "ffmpeg/ffmpeg-4.4-win64-shared/bin/avfilter-7.dll",
-                "ffmpeg/ffmpeg-4.4-win64-shared/bin/avformat-58.dll",
-                "ffmpeg/ffmpeg-4.4-win64-shared/bin/avutil-56.dll",
-                "ffmpeg/ffmpeg-4.4-win64-shared/bin/postproc-55.dll",
-                "ffmpeg/ffmpeg-4.4-win64-shared/bin/swresample-3.dll",
-                "ffmpeg/ffmpeg-4.4-win64-shared/bin/swscale-5.dll"
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/avcodec-58.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/avdevice-58.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/avfilter-7.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/avformat-58.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/avutil-56.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/postproc-55.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/swresample-3.dll",
+                "ffmpeg/ffmpeg-4.x-win64-shared/bin/swscale-5.dll"
               ]
             }
           ]

install_ffmpeg.js

@@ -100,14 +100,16 @@ async function win32() {
     else throw e;
   });
 
-  const ffmpegFilename = 'ffmpeg-4.4-win64-shared';
+  const ffmpegFilename = 'ffmpeg-4.x-win64-shared';
   await access(`ffmpeg/${ffmpegFilename}`, fs.constants.R_OK).catch(async () => {
     const html = await getHTML('https://github.com/BtbN/FFmpeg-Builds/wiki/Latest', 'latest autobuilds');
     const htmlStr = html.toString('utf-8');
     const autoPos = htmlStr.indexOf('<p><a href=');
     const endPos = htmlStr.indexOf('</div>', autoPos);
     const autoStr = htmlStr.substring(autoPos, endPos);
-    const sharedEndPos = autoStr.lastIndexOf('">win64-gpl-shared-4.4');
+    const sharedEndPos = autoStr.lastIndexOf('">win64-gpl-shared-4.');
+    if (sharedEndPos === -1)
+      throw new Error('Failed to find latest v4.x autobuild from "https://github.com/BtbN/FFmpeg-Builds/wiki/Latest"');
     const startStr = '<p><a href="';
     const sharedStartPos = autoStr.lastIndexOf(startStr, sharedEndPos) + startStr.length;
     const downloadSource = autoStr.substring(sharedStartPos, sharedEndPos);
@@ -212,7 +214,7 @@ case 'win32':
     console.error('Only 64-bit platforms are supported.');
     process.exit(1);
   } else {
-    win32();
+    win32().catch(console.error);
   }
   break;
 case 'linux':