Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-20 20:50:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #601 from tikuf/master

Browse source 
Add Topfield .rec files, Make sure scale w x h is divisible by 2
This commit is contained in:
Luke 2013-10-27 14:42:16 -07:00
parent 85568474ce 676579d4bd
commit 885ea9f6ba
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Api/Playback/BaseStreamingService.cs
View file

@ -269,7 +269,7 @@ namespace MediaBrowser.Api.Playback
// If fixed dimensions were supplied
if (request.Width.HasValue && request.Height.HasValue)
{
return string.Format(" -vf \"scale={0}:{1}{2}\"", request.Width.Value, request.Height.Value, assSubtitleParam);
return string.Format(" -vf \"scale=trunc({0}/2)*2:trunc({1}/2)*2{2}\"", request.Width.Value, request.Height.Value, assSubtitleParam);
}
var isH264Output = outputVideoCodec.Equals("libx264", StringComparison.OrdinalIgnoreCase);

3
MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
View file

@ -45,7 +45,8 @@ namespace MediaBrowser.Controller.Resolvers
".3gp",
".rec",
".webm",
".mts"
".mts",
".rec"
};
private static readonly Dictionary<string, string> VideoFileExtensionsDictionary = VideoFileExtensions.ToDictionary(i => i, StringComparer.OrdinalIgnoreCase);