diff --git a/MediaBrowser.Api/Playback/BifService.cs b/MediaBrowser.Api/Playback/BifService.cs
index 057d814417..181cdfe896 100644
--- a/MediaBrowser.Api/Playback/BifService.cs
+++ b/MediaBrowser.Api/Playback/BifService.cs
@@ -155,7 +155,7 @@ namespace MediaBrowser.Api.Playback
private byte[] GetBytes(int value)
{
byte[] bytes = BitConverter.GetBytes(value);
- if (BitConverter.IsLittleEndian)
+ if (!BitConverter.IsLittleEndian)
Array.Reverse(bytes);
return bytes;
}
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index cf31afd5d5..d631cab98d 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -503,7 +503,21 @@ namespace MediaBrowser.MediaEncoding.Encoder
process.Start();
- var ranToCompletion = process.WaitForExit(120000);
+ // Need to give ffmpeg enough time to make all the thumbnails, which could be a while,
+ // but we still need to detect if the process hangs.
+ // Making the assumption that as long as new jpegs are showing up, everything is good.
+
+ bool isResponsive = true;
+ int lastCount = 0;
+
+ while (isResponsive && !process.WaitForExit(120000))
+ {
+ int jpegCount = Directory.GetFiles(targetDirectory, "*.jpg").Count();
+ isResponsive = (jpegCount > lastCount);
+ lastCount = jpegCount;
+ }
+
+ bool ranToCompletion = process.HasExited;
if (!ranToCompletion)
{
diff --git a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
index 666eb1c10e..25fb839b41 100644
--- a/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
+++ b/MediaBrowser.Server.Mac/MediaBrowser.Server.Mac.csproj
@@ -735,12 +735,6 @@
Resources\dashboard-ui\css\images\mblogoicon.png
-
- Resources\dashboard-ui\css\images\mblogotextblack.png
-
-
- Resources\dashboard-ui\css\images\mblogotextwhite.png
-
Resources\dashboard-ui\css\images\rightarrow.png
diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
index 576b5b75f1..9821f49ddd 100644
--- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
+++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
@@ -67,7 +67,7 @@ namespace MediaBrowser.Server.Mac
return list;
}
- public void AuthorizeServer(int udpPort, int httpServerPort, string tempDirectory)
+ public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory)
{
}