diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-03-27 23:39:02 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-03-27 23:39:02 -0400 |
| commit | 362d8d5c965f76644410d9c92dbecb86b718de0c (patch) | |
| tree | 5b717f2e2890a89a2410b180720ee6a5a7c7cd55 | |
| parent | 68a398da3e740f59eedd71f83fee2024cfbe9bb7 (diff) | |
| parent | ca2062c7537b70793f923e9c4ba07009e29f4349 (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
| -rw-r--r-- | MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mac/Native/BaseMonoApp.cs | 2 | ||||
| -rw-r--r-- | SharedVersion.cs | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs index ac0f2c69d..a7b0d61c7 100644 --- a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs +++ b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs @@ -1,5 +1,4 @@ -using MediaBrowser.Common.IO; -using MediaBrowser.Controller.Chapters; +using MediaBrowser.Controller.Chapters; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.TV; @@ -153,7 +152,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder } catch (Exception ex) { - _logger.ErrorException("Error extraching chapter images for {0}", ex, string.Join(",", inputPath)); + _logger.ErrorException("Error extracting chapter images for {0}", ex, string.Join(",", inputPath)); success = false; break; } diff --git a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs index c48f609ae..33df83b2f 100644 --- a/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs +++ b/MediaBrowser.Server.Mac/Native/BaseMonoApp.cs @@ -76,7 +76,7 @@ namespace MediaBrowser.Server.Mac return list; } - public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string tempDirectory) + public void AuthorizeServer(int udpPort, int httpServerPort, int httpsPort, string applicationPath, string tempDirectory) { } diff --git a/SharedVersion.cs b/SharedVersion.cs index f2ac1e3a3..f6c35210c 100644 --- a/SharedVersion.cs +++ b/SharedVersion.cs @@ -1,4 +1,4 @@ using System.Reflection; -[assembly: AssemblyVersion("3.0.*")] -//[assembly: AssemblyVersion("3.0.5910")] +//[assembly: AssemblyVersion("3.0.*")] +[assembly: AssemblyVersion("3.0.5911")] |