summaryrefslogtreecommitdiff
path: root/internal/media/ffmpeg.go
diff options
context:
space:
mode:
authorLibravatar Daenney <daenney@users.noreply.github.com>2024-12-28 11:02:12 +0100
committerLibravatar GitHub <noreply@github.com>2024-12-28 11:02:12 +0100
commit6b727404befd8ec698e456d106a9ee40bc114af8 (patch)
treebe0a49d7d2533e04f5b89629730ec94a7577ea2d /internal/media/ffmpeg.go
parent[bugfix] small editing tweaks (#3631) (diff)
downloadgotosocial-6b727404befd8ec698e456d106a9ee40bc114af8.tar.xz
[bugfix] Advertise audio/mpeg as supported (#3632)
This will be either an mp1, mp2 or mp3 file. In practice it'll probably be mp3, but this handles mp1 too for good measure. We don't advertise audio/mp1 as a supported media type since best I can tell that was never a MIME type that's been used. This also changes the returned MIME-type for mp2 and mp3 to audio/mpeg, to match what's expected and supported by most things nowadays. Fixes: #3531
Diffstat (limited to 'internal/media/ffmpeg.go')
-rw-r--r--internal/media/ffmpeg.go7
1 files changed, 5 insertions, 2 deletions
diff --git a/internal/media/ffmpeg.go b/internal/media/ffmpeg.go
index c225d4378..6bf39cae2 100644
--- a/internal/media/ffmpeg.go
+++ b/internal/media/ffmpeg.go
@@ -377,12 +377,15 @@ func (res *result) GetFileType() (gtsmodel.FileType, string, string) {
case "mp3":
if len(res.audio) > 0 {
switch res.audio[0].codec {
+ case "mp1":
+ return gtsmodel.FileTypeAudio,
+ "audio/mpeg", "mp1"
case "mp2":
return gtsmodel.FileTypeAudio,
- "audio/mp2", "mp2"
+ "audio/mpeg", "mp2"
case "mp3":
return gtsmodel.FileTypeAudio,
- "audio/mp3", "mp3"
+ "audio/mpeg", "mp3"
}
}
case "asf":