aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-06-14 13:55:50 +0000
committerlambda <pleromagit@rogerbraun.net>2018-06-14 13:55:50 +0000
commit1c676b75738ec8448132b2cbcfbb71e075bf07b2 (patch)
tree9bad2e4490670da0954d2d8c28661c2db678b7fc
parent678df59d22165ac91d659901fcbefbd6384c6e87 (diff)
parent12c7a023decac20ca563c25faa4031c1b3cc56ca (diff)
downloadpleroma-1c676b75738ec8448132b2cbcfbb71e075bf07b2.tar.gz
Merge branch 'fix/mp3-recognition' into 'develop'
upload.ex: add MPEG Layer 3 file header. See merge request pleroma/pleroma!221
-rw-r--r--lib/pleroma/upload.ex3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
index ab4bd16f0..c7f11f380 100644
--- a/lib/pleroma/upload.ex
+++ b/lib/pleroma/upload.ex
@@ -151,6 +151,9 @@ defmodule Pleroma.Upload 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"