michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

3.2.30.26

Browse Source
This commit is contained in:
Luke Pulverenti 2017-09-19 16:08:34 -04:00
parent 34b72751e0
commit 467f440501
5 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Drawing/ImageProcessor.cs
View File

@ -810,7 +810,7 @@ namespace Emby.Drawing
}
catch (Exception ex)
{
_logger.Error("Error enhancing image", ex);
_logger.ErrorException("Error enhancing image", ex);
}
return new Tuple<string, DateTime, bool>(originalImagePath, dateModified, inputImageSupportsTransparency);

5
Emby.Server.Implementations/HttpServer/SocketSharp/WebSocketSharpListener.cs
View File

@ -185,11 +185,6 @@ namespace Emby.Server.Implementations.HttpServer.SocketSharp
if (_listener != null)
{
foreach (var prefix in _listener.Prefixes.ToList())
{
_listener.Prefixes.Remove(prefix);
}
_listener.Close();
}

2
Emby.Server.Implementations/LiveTv/LiveTvMediaSourceProvider.cs
View File

@ -143,7 +143,7 @@ namespace Emby.Server.Implementations.LiveTv
stream = info.Item1;
directStreamProvider = info.Item2;
allowLiveStreamProbe = false;
//allowLiveStreamProbe = false;
}
else
{

4
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

@ -1032,11 +1032,11 @@ namespace MediaBrowser.Controller.MediaEncoding
{
if (sourceBitrate <= 2000000)
{
sourceBitrate *= 2;
sourceBitrate = Convert.ToInt32(sourceBitrate * 2.5);
}
else if (sourceBitrate <= 3000000)
{
sourceBitrate = Convert.ToInt32(sourceBitrate * 1.5);
sourceBitrate = Convert.ToInt32(sourceBitrate * 2);
}
var bitrate = Math.Min(sourceBitrate, requestedBitrate);

2
SharedVersion.cs
View File

@ -1,3 +1,3 @@
using System.Reflection;
[assembly: AssemblyVersion("3.2.30.25")]
[assembly: AssemblyVersion("3.2.30.26")]