@@ -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);
@@ -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();
@@ -143,7 +143,7 @@ namespace Emby.Server.Implementations.LiveTv
stream = info.Item1;
directStreamProvider = info.Item2;
- allowLiveStreamProbe = false;
+ //allowLiveStreamProbe = false;
else
@@ -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);
@@ -1,3 +1,3 @@
using System.Reflection;
-[assembly: AssemblyVersion("3.2.30.25")]
+[assembly: AssemblyVersion("3.2.30.26")]