pleroma

commit: b9bc83097d01f445ca30bf0f70242fa50f1f2d40
parent: 5ae6088d37c193b06612669307163b6b86f4189a
Author: kaniini <nenolod@gmail.com>
Date:   Tue, 27 Nov 2018 16:55:56 +0000

Merge branch 'ogg-theora-detection' into 'develop'

Add Theora detection to upload.ex

See merge request pleroma/pleroma!479
Diffstat:
M
lib/pleroma/upload.ex
8
+++++++-

1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex
@@ -162,7 +162,13 @@ defmodule Pleroma.Upload do
             "audio/mpeg"
 
           <<0x4F, 0x67, 0x67, 0x53, 0x00, 0x02, 0x00, 0x00>> ->
-            "audio/ogg"
+            case IO.binread(f, 27) do
+              <<_::size(160), 0x80, 0x74, 0x68, 0x65, 0x6F, 0x72, 0x61>> ->
+                "video/ogg"
+
+              _ ->
+                "audio/ogg"
+            end
 
           <<0x52, 0x49, 0x46, 0x46, _, _, _, _>> ->
             "audio/wav"