aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Jellyfin.Api/Controllers/DynamicHlsController.cs14
1 files changed, 12 insertions, 2 deletions
diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs
index f8e8d975c..6347b908c 100644
--- a/Jellyfin.Api/Controllers/DynamicHlsController.cs
+++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs
@@ -1773,13 +1773,23 @@ namespace Jellyfin.Api.Controllers
var args = "-codec:v:0 " + codec;
- // Prefer hvc1 to hev1.
if (string.Equals(state.ActualOutputVideoCodec, "h265", StringComparison.OrdinalIgnoreCase)
|| string.Equals(state.ActualOutputVideoCodec, "hevc", StringComparison.OrdinalIgnoreCase)
|| string.Equals(codec, "h265", StringComparison.OrdinalIgnoreCase)
|| string.Equals(codec, "hevc", StringComparison.OrdinalIgnoreCase))
{
- args += " -tag:v:0 hvc1";
+ if (EncodingHelper.IsCopyCodec(codec)
+ && (string.Equals(state.VideoStream.CodecTag, "dvh1", StringComparison.OrdinalIgnoreCase)
+ || string.Equals(state.VideoStream.CodecTag, "dvhe", StringComparison.OrdinalIgnoreCase)))
+ {
+ // Prefer dvh1 to dvhe
+ args += " -tag:v:0 dvh1";
+ }
+ else
+ {
+ // Prefer hvc1 to hev1
+ args += " -tag:v:0 hvc1";
+ }
}
// if (state.EnableMpegtsM2TsMode)