Merge branch 'release/2.1.0' into develop

[oweals/peertube.git] / server / initializers / constants.ts

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 0476815f443e72b4b27a846ac29264d26c36f6ad..cb1c6f2ae1b176fd36242a86f2b9442050def8e3 100644 (file)
--- a/server/initializers/constants.ts
+++ b/server/initializers/constants.ts
@@ -406,6 +406,9 @@ const MIMETYPES = {
       'audio/mp3': '.mp3',
       'application/ogg': '.ogg',
       'audio/ogg': '.ogg',
+      'audio/x-ms-wma': '.wma',
+      'audio/wav': '.wav',
+      'audio/x-flac': '.flac',
       'audio/flac': '.flac'
     },
     EXT_MIMETYPE: null as { [ id: string ]: string }
@@ -797,6 +800,8 @@ function buildVideoMimetypeExt () {
         'video/x-matroska': '.mkv',
         'video/avi': '.avi',
         'video/x-m4v': '.m4v',
+        // Could be anything
+        'application/octet-stream': null,
         'video/m4v': '.m4v'
       })
     }