From 74f61fbd79ef2e2ad4a986f5f886581b2827de07 Mon Sep 17 00:00:00 2001
From: lonebyte <61915324+lonebyte@users.noreply.github.com>
Date: Tue, 10 Oct 2023 22:48:52 +0200
Subject: Fix HLS playback of m4a files with mjpeg stream (#10069)

---
 Jellyfin.Api/Controllers/DynamicHlsController.cs | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'Jellyfin.Api/Controllers/DynamicHlsController.cs')

diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index 7bf366e5d..42c94c29d 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -1721,14 +1721,17 @@ public class DynamicHlsController : BaseJellyfinApiController
 
         if (!state.IsOutputVideo)
         {
+            var audioTranscodeParams = string.Empty;
+
+            // -vn to drop any video streams
+            audioTranscodeParams += "-vn";
+
             if (EncodingHelper.IsCopyCodec(audioCodec))
             {
-                return "-acodec copy" + bitStreamArgs + strictArgs;
+                return audioTranscodeParams + " -acodec copy" + bitStreamArgs + strictArgs;
             }
 
-            var audioTranscodeParams = string.Empty;
-
-            audioTranscodeParams += "-acodec " + audioCodec + bitStreamArgs + strictArgs;
+            audioTranscodeParams += " -acodec " + audioCodec + bitStreamArgs + strictArgs;
 
             var audioBitrate = state.OutputAudioBitrate;
             var audioChannels = state.OutputAudioChannels;
@@ -1756,7 +1759,6 @@ public class DynamicHlsController : BaseJellyfinApiController
                 audioTranscodeParams += " -ar " + state.OutputAudioSampleRate.Value.ToString(CultureInfo.InvariantCulture);
             }
 
-            audioTranscodeParams += " -vn";
             return audioTranscodeParams;
         }
 
-- 
cgit v1.2.3