Merge pull request #1425 from EvanBldy/master

various improvements
cgwire · Apr 29, 2024 · bab1335 · bab1335
2 parents 656e519 + d8ecd53
commit bab1335
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/components/previews/VideoProgress.vue b/src/components/previews/VideoProgress.vue
@@ -524,6 +524,9 @@ export default {
       } else {
         frame = frame - 1
       }
+      if (this.nbFrames >= 3840) {
+        frame = Math.ceil(frame / Math.ceil(this.nbFrames / 3840))
+      }
       const frameX = frame % 8
       const frameY = Math.floor(frame / 8)
       const frameHeight = 100

diff --git a/src/lib/files.js b/src/lib/files.js
@@ -31,7 +31,8 @@ const ALL_EXTENSIONS = [
   'mp3',
   'webm',
   'avi',
-  'clip'
+  'clip',
+  'mkv'
 ]
 const ALL_EXTENSIONS_STRING = ALL_EXTENSIONS.map(e => `.${e}`).join(',')