From d5c9c4adc167cdb05e73f5105702cf340293e61c Mon Sep 17 00:00:00 2001 From: Daenney Date: Thu, 22 May 2025 12:26:11 +0200 Subject: [chore] Upgrade to Go 1.24 (#4187) * Set `go.mod` to 1.24 now that it's been out for 3 months. * Update all the test to use `testing.T.Context()`. Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4187 Co-authored-by: Daenney Co-committed-by: Daenney --- internal/media/ffmpeg.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'internal/media/ffmpeg.go') diff --git a/internal/media/ffmpeg.go b/internal/media/ffmpeg.go index 41cc2666f..676eba9be 100644 --- a/internal/media/ffmpeg.go +++ b/internal/media/ffmpeg.go @@ -348,11 +348,10 @@ func (res *result) GetFileType() (gtsmodel.FileType, string, string) { // video file aka gifv. return gtsmodel.FileTypeGifv, "video/mp4", "mp4" - } else { - // Video file (with or without audio). - return gtsmodel.FileTypeVideo, - "video/mp4", "mp4" } + // Video file (with or without audio). + return gtsmodel.FileTypeVideo, + "video/mp4", "mp4" case len(res.audio) > 0 && res.audio[0].codec == "aac": // m4a only supports [aac] audio. -- cgit v1.2.3