Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-22 05:30:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

updated windows ffmpeg url

Browse source
This commit is contained in:
Luke Pulverenti 2013-10-05 10:17:27 -04:00
parent d1d639ce2c
commit fb39ed9c9c
3 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
MediaBrowser.Api/DefaultTheme/DefaultThemeService.cs
View file

@ -121,8 +121,7 @@ namespace MediaBrowser.Api.DefaultTheme
{ {
var user = _userManager.GetUserById(request.UserId); var user = _userManager.GetUserById(request.UserId);
var items = user.RootFolder.GetRecursiveChildren(user) var items = user.RootFolder.GetRecursiveChildren(user, i => i is Game || i is GameSystem)
.Where(i => i is Game || i is GameSystem)
.ToList(); .ToList();
var itemsWithBackdrops = FilterItemsForBackdropDisplay(items.Where(i => i.BackdropImagePaths.Count > 0)).ToList(); var itemsWithBackdrops = FilterItemsForBackdropDisplay(items.Where(i => i.BackdropImagePaths.Count > 0)).ToList();
@ -214,8 +213,7 @@ namespace MediaBrowser.Api.DefaultTheme
{ {
var user = _userManager.GetUserById(request.UserId); var user = _userManager.GetUserById(request.UserId);
var items = user.RootFolder.GetRecursiveChildren(user) var items = user.RootFolder.GetRecursiveChildren(user, i => i is Movie || i is Trailer || i is BoxSet)
.Where(i => i is Movie || i is Trailer || i is BoxSet)
.ToList(); .ToList();
// Exclude trailers from backdrops because they're not always 1080p // Exclude trailers from backdrops because they're not always 1080p

10
MediaBrowser.Mono.userprefs
View file

@ -1,11 +1,9 @@
<Properties> <Properties>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Release|x86" /> <MonoDevelop.Ide.Workspace ActiveConfiguration="Debug|x86" />
<MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mono\Native\HttpClientFactory.cs"> <MonoDevelop.Ide.Workbench ActiveDocument="MediaBrowser.Server.Mono\FFMpeg\FFMpegDownloader.cs">
<Files> <Files>
<File FileName="MediaBrowser.Server.Mono\app.config" Line="1" Column="1" /> <File FileName="MediaBrowser.Server.Implementations\HttpServer\HttpServer.cs" Line="604" Column="23" />
<File FileName="MediaBrowser.ServerApplication\ApplicationHost.cs" Line="1" Column="1" /> <File FileName="MediaBrowser.Server.Mono\FFMpeg\FFMpegDownloader.cs" Line="1" Column="1" />
<File FileName="MediaBrowser.Server.Mono\Program.cs" Line="1" Column="1" />
<File FileName="MediaBrowser.Server.Mono\Native\HttpClientFactory.cs" Line="6" Column="15" />
</Files> </Files>
</MonoDevelop.Ide.Workbench> </MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.Breakpoints> <MonoDevelop.Ide.DebuggingService.Breakpoints>

2
MediaBrowser.ServerApplication/FFMpeg/FFMpegDownloader.cs
View file

@ -30,7 +30,7 @@ namespace MediaBrowser.ServerApplication.FFMpeg
private readonly string[] _ffMpegUrls = new[] private readonly string[] _ffMpegUrls = new[]
{ {
"https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/ffmpeg-20130904-git-f974289-win32-static.7z", "https://github.com/MediaBrowser/MediaBrowser.Resources/raw/master/ffmpeg/windows/ffmpeg-20130904-git-f974289-win32-static.7z",
"http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20130904-git-f974289-win32-static.7z", "http://ffmpeg.zeranoe.com/builds/win32/static/ffmpeg-20130904-git-f974289-win32-static.7z",
"https://www.dropbox.com/s/a81cb2ob23fwcfs/ffmpeg-20130904-git-f974289-win32-static.7z?dl=1" "https://www.dropbox.com/s/a81cb2ob23fwcfs/ffmpeg-20130904-git-f974289-win32-static.7z?dl=1"