Fix conflicts

2020-05-05 18:16:52 +08:00
parent b2ab75cfdc 0603c41eb5
commit 612b11e629
5 changed files with 95 additions and 1 deletions
--- a/tests/constants.js
+++ b/tests/constants.js
@@ -4,6 +4,9 @@ const IS_BROWSER = typeof window !== 'undefined' && typeof window.document !== '
 const OPTIONS = {
  corePath: 'http://localhost:3000/node_modules/@ffmpeg/core/ffmpeg-core.js',
 };
+const FLAME_MP4_LENGTH = 100374;
+const META_FLAME_MP4_LENGTH = 100408;
+const META_FLAME_MP4_LENGTH_NO_SPACE = 100404;

 if (typeof module !== 'undefined') {
  module.exports = {
@@ -11,5 +14,8 @@ if (typeof module !== 'undefined') {
    BASE_URL,
    IS_BROWSER,
    OPTIONS,
+    FLAME_MP4_LENGTH,
+    META_FLAME_MP4_LENGTH,
+    META_FLAME_MP4_LENGTH_NO_SPACE,
  };
 }