alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 17:14:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'jellyfin:master' into feature/EFUserData

Browse Source
This commit is contained in:
JPVenson
2024-11-14 21:56:18 +01:00
committed by GitHub
parent 30ba35aa0c 53683809d9
commit e8be7ab011
63 changed files with 695 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@@ -208,6 +208,14 @@ namespace MediaBrowser.Model.Dlna
var longBitrate = Math.Min(transcodingBitrate, playlistItem.AudioBitrate ?? transcodingBitrate);
playlistItem.AudioBitrate = longBitrate > int.MaxValue ? int.MaxValue : Convert.ToInt32(longBitrate);
// Pure audio transcoding does not support comma separated list of transcoding codec at the moment.
// So just use the AudioCodec as is would be safe enough as the _transcoderSupport.CanEncodeToAudioCodec
// would fail so this profile will not even be picked up.
if (playlistItem.AudioCodecs.Count == 0 && !string.IsNullOrWhiteSpace(transcodingProfile.AudioCodec))
{
playlistItem.AudioCodecs = [transcodingProfile.AudioCodec];
}
}
playlistItem.TranscodeReasons = transcodeReasons;

2
MediaBrowser.Model/MediaBrowser.Model.csproj
View File

@@ -8,7 +8,7 @@
<PropertyGroup>
<Authors>Jellyfin Contributors</Authors>
<PackageId>Jellyfin.Model</PackageId>
<VersionPrefix>10.10.0</VersionPrefix>
<VersionPrefix>10.11.0</VersionPrefix>
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
</PropertyGroup>