Merge branch 'master' into master

Author: jeromewu

package-lock.json

@@ -88,7 +88,7 @@ module.exports = (_options = {}) => {
           return prefix + path;
         },
       });
-      ffmpeg = Core.cwrap('proxy_main', 'number', ['number', 'number']);
+      ffmpeg = Core.cwrap(options.mainName || 'proxy_main', 'number', ['number', 'number']);
       log('info', 'ffmpeg-core loaded');
     } else {
       throw Error('ffmpeg.wasm was loaded, you should not load it again, use ffmpeg.isLoaded() to check next time.');
@@ -187,6 +187,7 @@ module.exports = (_options = {}) => {
         ffmpeg = null;
         runResolve = null;
       }
+
     }
   };