Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
This commit is contained in:
commit
362d8d5c96
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
|
@ -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")]
|
||||
|
|
Loading…
Reference in New Issue
Block a user