Merge branch 'release/2.1.0' into develop

1 files changed, 5 insertions, 0 deletions

diff --git a/server/initializers/constants.ts b/server/initializers/constants.ts
index 0476815f4..cb1c6f2ae 100644
--- 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'
       })
     }