lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests 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 2016-03-27 23:39:02 -04:00
commit 362d8d5c96
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
View File

@ -1,5 +1,4 @@
using MediaBrowser.Common.IO; using MediaBrowser.Controller.Chapters;
using MediaBrowser.Controller.Chapters;
using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.Movies;
using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.Entities.TV;
@ -153,7 +152,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
} }
catch (Exception ex) 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; success = false;
break; break;
} }

2
MediaBrowser.Server.Mac/Native/BaseMonoApp.cs
View File

@ -76,7 +76,7 @@ namespace MediaBrowser.Server.Mac
return list; 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)
{ {
} }

4
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection; using System.Reflection;
[assembly: AssemblyVersion("3.0.*")] //[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5910")] [assembly: AssemblyVersion("3.0.5911")]