alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-07-19 12:44:19 +01:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge branch 'master' into AsyncKeyedLock-migration

Browse Source
This commit is contained in:
Mark Cilia Vincenti
2024-01-14 11:45:19 +01:00
parent d1677dc680 d40224128c
commit 6a257e1b40
155 changed files with 827 additions and 1315 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@@ -1068,7 +1068,7 @@ namespace MediaBrowser.Controller.MediaEncoding
}
// hw transpose filters should be added manually.
args.Append(" -autorotate 0");
args.Append(" -noautorotate");
return args.ToString().Trim();
}
@@ -1159,7 +1159,7 @@ namespace MediaBrowser.Controller.MediaEncoding
var isSwDecoder = string.IsNullOrEmpty(GetHardwareVideoDecoder(state, options));
if (!isSwDecoder && _mediaEncoder.EncoderVersion >= new Version(4, 4))
{
arg.Append(" -autoscale 0");
arg.Append(" -noautoscale");
}
return arg.ToString();