Merge pull request #601 from tikuf/master

Add Topfield .rec files, Make sure scale w x h is divisible by 2
pull/702/head
Luke 11 years ago
commit 885ea9f6ba

@ -269,7 +269,7 @@ namespace MediaBrowser.Api.Playback
// If fixed dimensions were supplied // If fixed dimensions were supplied
if (request.Width.HasValue && request.Height.HasValue) 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); var isH264Output = outputVideoCodec.Equals("libx264", StringComparison.OrdinalIgnoreCase);

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

Loading…
Cancel
Save