Merge branch 'release/2.1.0' into develop

2 files changed, 8 insertions, 1 deletions

diff --git a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
index aa3a85995..aa87f9581 100644
--- a/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
+++ b/client/src/app/videos/+video-edit/video-add-components/video-upload.component.ts
@@ -293,6 +293,8 @@ export class VideoUploadComponent extends VideoSend implements OnInit, OnDestroy
   }
 
   private isAudioFile (filename: string) {
-    return filename.endsWith('.mp3') || filename.endsWith('.flac') || filename.endsWith('.ogg')
+    const extensions = [ '.mp3', '.flac', '.ogg', '.wma', '.wav' ]
+
+    return extensions.some(e => filename.endsWith(e))
   }
 }
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'
       })
     }