cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-16 10:29:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev

Browse Source
This commit is contained in:
Luke Pulverenti 2015-10-30 11:27:17 -04:00
commit 23d65f4871
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
MediaBrowser.MediaEncoding/Probing/InternalMediaInfoResult.cs
View File

@ -114,6 +114,12 @@ namespace MediaBrowser.MediaEncoding.Probing
/// <value>The width.</value>
public int width { get; set; }
/// <summary>
/// Gets or sets the refs.
/// </summary>
/// <value>The refs.</value>
public int refs { get; set; }
/// <summary>
/// Gets or sets the height.
/// </summary>

16
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -189,6 +189,11 @@ namespace MediaBrowser.MediaEncoding.Probing
// http://stackoverflow.com/questions/17353387/how-to-detect-anamorphic-video-with-ffprobe
stream.IsAnamorphic = string.Equals(streamInfo.sample_aspect_ratio, "0:1", StringComparison.OrdinalIgnoreCase);
if (streamInfo.refs > 0)
{
stream.RefFrames = streamInfo.refs;
}
}
else
{
@ -927,9 +932,7 @@ namespace MediaBrowser.MediaEncoding.Probing
private void UpdateFromMediaInfo(MediaSourceInfo video, MediaStream videoStream)
{
if (video.Protocol == MediaProtocol.File)
{
if (videoStream != null)
if (video.Protocol == MediaProtocol.File && videoStream != null)
{
try
{
@ -940,7 +943,11 @@ namespace MediaBrowser.MediaEncoding.Probing
videoStream.IsCabac = result.IsCabac ?? videoStream.IsCabac;
videoStream.IsInterlaced = result.IsInterlaced ?? videoStream.IsInterlaced;
videoStream.BitDepth = result.BitDepth ?? videoStream.BitDepth;
videoStream.RefFrames = result.RefFrames;
videoStream.RefFrames = result.RefFrames ?? videoStream.RefFrames;
}
catch (TypeLoadException)
{
// This is non-essential. Don't spam the log
}
catch (Exception ex)
{
@ -949,5 +956,4 @@ namespace MediaBrowser.MediaEncoding.Probing
}
}
}
}
}

1
MediaBrowser.Server.Mac/Main.cs
View File

@ -92,6 +92,7 @@ namespace MediaBrowser.Server.Mac
ServicePointManager.ServerCertificateValidationCallback = new RemoteCertificateValidationCallback(delegate { return true; });
var fileSystem = new ManagedFileSystem(new PatternsLogger(logManager.GetLogger("FileSystem")), false, true);
fileSystem.AddShortcutHandler(new MbLinkShortcutHandler(fileSystem));
var nativeApp = new NativeApp();