diff options
| author | kaniini <nenolod@gmail.com> | 2018-11-27 16:55:56 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-11-27 16:55:56 +0000 |
| commit | b9bc83097d01f445ca30bf0f70242fa50f1f2d40 (patch) | |
| tree | 555a38343f594f7d424431b8d37e78baa9398ce4 | |
| parent | 5ae6088d37c193b06612669307163b6b86f4189a (diff) | |
| parent | 0d229613dfc771ee71272541ffff9ef640c2dc05 (diff) | |
| download | pleroma-b9bc83097d01f445ca30bf0f70242fa50f1f2d40.tar.gz | |
Merge branch 'ogg-theora-detection' into 'develop'
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
| -rw-r--r-- | lib/pleroma/upload.ex | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/pleroma/upload.ex b/lib/pleroma/upload.ex index 89aa779f9..238630bf3 100644 --- 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" |