update ffmpeg
This commit is contained in:
parent
cc19ce0daf
commit
c15afb479b
|
@ -70,7 +70,6 @@ namespace MediaBrowser.Api
|
||||||
_config.Configuration.EnableStandaloneMetadata = true;
|
_config.Configuration.EnableStandaloneMetadata = true;
|
||||||
_config.Configuration.EnableLibraryMetadataSubFolder = true;
|
_config.Configuration.EnableLibraryMetadataSubFolder = true;
|
||||||
_config.Configuration.EnableCustomPathSubFolders = true;
|
_config.Configuration.EnableCustomPathSubFolders = true;
|
||||||
_config.Configuration.DisableStartupScan = true;
|
|
||||||
_config.Configuration.EnableUserViews = true;
|
_config.Configuration.EnableUserViews = true;
|
||||||
_config.Configuration.EnableDateLastRefresh = true;
|
_config.Configuration.EnableDateLastRefresh = true;
|
||||||
_config.Configuration.EnableSharedCollectionViewImage = true;
|
_config.Configuration.EnableSharedCollectionViewImage = true;
|
||||||
|
|
|
@ -104,12 +104,6 @@ namespace MediaBrowser.Model.Configuration
|
||||||
/// <value><c>true</c> if [enable user views]; otherwise, <c>false</c>.</value>
|
/// <value><c>true</c> if [enable user views]; otherwise, <c>false</c>.</value>
|
||||||
public bool EnableUserViews { get; set; }
|
public bool EnableUserViews { get; set; }
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Gets or sets a value indicating whether [disable startup scan].
|
|
||||||
/// </summary>
|
|
||||||
/// <value><c>true</c> if [disable startup scan]; otherwise, <c>false</c>.</value>
|
|
||||||
public bool DisableStartupScan { get; set; }
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Gets or sets a value indicating whether [enable library metadata sub folder].
|
/// Gets or sets a value indicating whether [enable library metadata sub folder].
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -120,12 +120,6 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
progress.Report(percent * 100);
|
progress.Report(percent * 100);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_config.Configuration.DisableStartupScan)
|
|
||||||
{
|
|
||||||
_config.Configuration.DisableStartupScan = true;
|
|
||||||
_config.SaveConfiguration();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (_config.Configuration.MigrationVersion < MigrationVersion)
|
if (_config.Configuration.MigrationVersion < MigrationVersion)
|
||||||
{
|
{
|
||||||
_config.Configuration.MigrationVersion = MigrationVersion;
|
_config.Configuration.MigrationVersion = MigrationVersion;
|
||||||
|
@ -181,7 +175,18 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
//Limit = limit,
|
//Limit = limit,
|
||||||
|
|
||||||
// These have their own cleanup routines
|
// These have their own cleanup routines
|
||||||
ExcludeItemTypes = new[] { typeof(Person).Name, typeof(Genre).Name, typeof(MusicGenre).Name, typeof(GameGenre).Name, typeof(Studio).Name, typeof(Year).Name, typeof(Channel).Name }
|
ExcludeItemTypes = new[]
|
||||||
|
{
|
||||||
|
typeof(Person).Name,
|
||||||
|
typeof(Genre).Name,
|
||||||
|
typeof(MusicGenre).Name,
|
||||||
|
typeof(GameGenre).Name,
|
||||||
|
typeof(Studio).Name,
|
||||||
|
typeof(Year).Name,
|
||||||
|
typeof(Channel).Name,
|
||||||
|
typeof(AggregateFolder).Name,
|
||||||
|
typeof(CollectionFolder).Name
|
||||||
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
var numComplete = 0;
|
var numComplete = 0;
|
||||||
|
|
|
@ -2014,7 +2014,8 @@ namespace MediaBrowser.Server.Implementations.Persistence
|
||||||
typeof(UserView),
|
typeof(UserView),
|
||||||
typeof(Video),
|
typeof(Video),
|
||||||
typeof(Year),
|
typeof(Year),
|
||||||
typeof(Channel)
|
typeof(Channel),
|
||||||
|
typeof(AggregateFolder)
|
||||||
};
|
};
|
||||||
|
|
||||||
public async Task UpdateInheritedValues(CancellationToken cancellationToken)
|
public async Task UpdateInheritedValues(CancellationToken cancellationToken)
|
||||||
|
|
|
@ -43,11 +43,6 @@ namespace MediaBrowser.Server.Implementations.ScheduledTasks
|
||||||
|
|
||||||
}.ToList();
|
}.ToList();
|
||||||
|
|
||||||
if (!_config.Configuration.DisableStartupScan)
|
|
||||||
{
|
|
||||||
list.Add(new StartupTrigger());
|
|
||||||
}
|
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -54,7 +54,7 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
|
||||||
|
|
||||||
info.FFMpegFilename = "ffmpeg.exe";
|
info.FFMpegFilename = "ffmpeg.exe";
|
||||||
info.FFProbeFilename = "ffprobe.exe";
|
info.FFProbeFilename = "ffprobe.exe";
|
||||||
info.Version = "20150918";
|
info.Version = "20151111";
|
||||||
info.ArchiveType = "7z";
|
info.ArchiveType = "7z";
|
||||||
|
|
||||||
switch (environment.SystemArchitecture)
|
switch (environment.SystemArchitecture)
|
||||||
|
@ -83,14 +83,14 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
|
||||||
case Architecture.X86_X64:
|
case Architecture.X86_X64:
|
||||||
return new[]
|
return new[]
|
||||||
{
|
{
|
||||||
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20150918-win64.7z",
|
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20151111-win64.7z",
|
||||||
"http://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-20150916-git-cbbd906-win64-static.7z"
|
"http://ffmpeg.zeranoe.com/builds/win64/static/ffmpeg-20151109-git-480bad7-win64-static.7z"
|
||||||
};
|
};
|
||||||
case Architecture.X86:
|
case Architecture.X86:
|
||||||
return new[]
|
return new[]
|
||||||
{
|
{
|
||||||
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20150918-win32.7z",
|
"https://github.com/MediaBrowser/Emby.Resources/raw/master/ffmpeg/windows/ffmpeg-20151111-win32.7z",
|
||||||
"http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20150916-git-cbbd906-win32-static.7z"
|
"http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20151109-git-480bad7-win32-static.7z"
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user