diff --git a/doc/capabilities.js.html b/doc/capabilities.js.html index 494eeac2..7899d6f5 100644 --- a/doc/capabilities.js.html +++ b/doc/capabilities.js.html @@ -42,7 +42,7 @@

Source: capabilities.js

var ffEncodersRegexp = /\(encoders:([^\)]+)\)/; var ffDecodersRegexp = /\(decoders:([^\)]+)\)/; var encodersRegexp = /^\s*([VAS\.])([F\.])([S\.])([X\.])([B\.])([D\.]) ([^ ]+) +(.*)$/; -var formatRegexp = /^\s*([D ])([E ])\s+([^ ]+)\s+(.*)$/; +var formatRegexp = /^\s*([D ])([E ])[d ]?\s+([^ ]+)\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 index 1c89c02f..ac405289 100644 --- 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 ])\s+([^ ]+)\s+(.*)$/; +var formatRegexp = /^\s*([D ])([E ])[d ]?\s+([^ ]+)\s+(.*)$/; var lineBreakRegexp = /\r\n|\r|\n/; var filterRegexp = /^(?: [T\.][S\.][C\.] )?([^ ]+) +(AA?|VV?|\|)->(AA?|VV?|\|) +(.*)$/; diff --git a/test/capabilities.test.js b/test/capabilities.test.js index c8855f1e..ba923b46 100644 --- 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(); }); });