Merge branch 'fix/mp3-recognition' into 'develop'

upload.ex: add MPEG Layer 3 file header. See merge request pleroma/pleroma!221
2018-06-14 13:55:50 +00:00 · 2018-06-14 13:55:50 +00:00 · 1c676b7573
commit 1c676b7573
parent 678df59d22 12c7a023de
1 changed files with 3 additions and 0 deletions
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@ -151,6 +151,9 @@ def get_content_type(file) do
          <<0x49, 0x44, 0x33, _, _, _, _, _>> ->
            "audio/mpeg"

+          <<255, 251, _, 68, 0, 0, 0, 0>> ->
+            "audio/mpeg"
+
          <<0x4F, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00>> ->
            "audio/ogg"