Fixing capability parsing for ffmpeg 6+

descriptinc · Jul 23, 2024 · 07d276f · 07d276f
1 parent 02a5609
commit 07d276f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 3 deletions.
diff --git a/doc/capabilities.js.html b/doc/capabilities.js.html
@@ -42,7 +42,7 @@ <h1 class="page-title">Source: capabilities.js</h1>
 var ffEncodersRegexp = /\(encoders:([^\)]+)\)/;
 var ffDecodersRegexp = /\(decoders:([^\)]+)\)/;
 var encodersRegexp = /^\s*([VAS\.])([F\.])([S\.])([X\.])([B\.])([D\.]) ([^ ]+) +(.*)$/;
-var formatRegexp = /^\s*([D ])([E ]) ([^ ]+) +(.*)$/;
+var formatRegexp = /^\s*([D ])([E ])[d ]?\s+([^ ]+) +(.*)$/;
 var lineBreakRegexp = /\r\n|\r|\n/;
 var filterRegexp = /^(?: [T\.][S\.][C\.] )?([^ ]+) +(AA?|VV?|\|)->(AA?|VV?|\|) +(.*)$/;
 

diff --git a/lib/capabilities.js b/lib/capabilities.js
@@ -15,7 +15,7 @@ var ffCodecRegexp = /^\s*([D\.])([E\.])([VAS])([I\.])([L\.])([S\.]) ([^ ]+) +(.*
 var ffEncodersRegexp = /\(encoders:([^\)]+)\)/;
 var ffDecodersRegexp = /\(decoders:([^\)]+)\)/;
 var encodersRegexp = /^\s*([VAS\.])([F\.])([S\.])([X\.])([B\.])([D\.]) ([^ ]+) +(.*)$/;
-var formatRegexp = /^\s*([D ])([E ]) ([^ ]+) +(.*)$/;
+var formatRegexp = /^\s*([D ])([E ])[d ]?\s+([^ ]+) +(.*)$/;
 var lineBreakRegexp = /\r\n|\r|\n/;
 var filterRegexp = /^(?: [T\.][S\.][C\.] )?([^ ]+) +(AA?|VV?|\|)->(AA?|VV?|\|) +(.*)$/;
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@descript/fluent-ffmpeg",
-  "version": "2.1.2-descript.5",
+  "version": "2.1.3-descript.1",
   "description": "A fluent API to FFMPEG (http://www.ffmpeg.org)",
   "keywords": [
     "ffmpeg"

diff --git a/test/capabilities.test.js b/test/capabilities.test.js
@@ -72,6 +72,14 @@ describe('Capabilities', function() {
         ('canDemux' in formats.wav).should.equal(true);
         (typeof formats.wav.canDemux).should.equal('boolean');
 
+        ('lavfi' in formats).should.equal(true);
+        ('description' in formats.lavfi).should.equal(true);
+        (typeof formats.lavfi.description).should.equal('string');
+        ('canMux' in formats.lavfi).should.equal(true);
+        (typeof formats.lavfi.canMux).should.equal('boolean');
+        ('canDemux' in formats.lavfi).should.equal(true);
+        (typeof formats.lavfi.canDemux).should.equal('boolean');
+
         done();
       });
     });