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

updated nuget + subtitle changes

Browse Source
This commit is contained in:
Luke Pulverenti
2013-10-05 23:03:08 -04:00
parent 3fbf08b882
commit 863f123f3c
14 changed files with 164 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Api/Playback/BaseStreamingService.cs
View File

@@ -286,8 +286,8 @@ namespace MediaBrowser.Api.Playback
if (request.Height.HasValue)
{
return isH264Output ?
string.Format(" -vf \"scale={0}:trunc(oh/a/2)*2{1}\"", request.Height.Value, assSubtitleParam) :
string.Format(" -vf \"scale=-1{1}:{0}\"", request.Height.Value, assSubtitleParam);
string.Format(" -vf \"scale=trunc(oh*a*2)/2:{0}{1}\"", request.Height.Value, assSubtitleParam) :
string.Format(" -vf \"scale=-1:{0}{1}\"", request.Height.Value, assSubtitleParam);
}
// If a max width was requested
@@ -302,8 +302,8 @@ namespace MediaBrowser.Api.Playback
if (request.MaxHeight.HasValue && (!request.MaxWidth.HasValue || state.VideoStream == null))
{
return isH264Output ?
string.Format(" -vf \"scale=min(ih\\,{0}):trunc(oh/a/2)*2{1}\"", request.MaxHeight.Value, assSubtitleParam) :
string.Format(" -vf \"scale=min(ih\\,{0}):-1{1}\"", request.MaxHeight.Value, assSubtitleParam);
string.Format(" -vf \"scale=trunc(oh*a*2)/2:min(ih\\,{0}){1}\"", request.MaxHeight.Value, assSubtitleParam) :
string.Format(" -vf \"scale=-1:min(ih\\,{0}){1}\"", request.MaxHeight.Value, assSubtitleParam);
}
if (state.VideoStream == null)