pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1346 from MediaBrowser/master 

merge from master
This commit is contained in:
Luke 2015-12-21 12:50:25 -05:00
parent 7dffc197da 83a2823c17
commit 887c09e737
5 changed files with 916 additions and 475 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1359
MediaBrowser.Server.Mac/Emby.Server.Mac.csproj
View File

File diff suppressed because it is too large Load Diff

3
MediaBrowser.Server.Mac/MediaBrowser.MediaInfo.dll.config
View File

@ -1,3 +0,0 @@
<configuration>
<dllmap dll="MediaInfo" target="libmediainfo.dylib" os="osx"/>
</configuration>

10
MediaBrowser.Server.Startup.Common/FFMpeg/FFMpegDownloader.cs
View File

@ -111,6 +111,16 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
DeleteOlderFolders(Path.GetDirectoryName(versionedDirectoryPath), excludeFromDeletions); DeleteOlderFolders(Path.GetDirectoryName(versionedDirectoryPath), excludeFromDeletions);
// Allow just one of these to be overridden, if desired.
if (!string.IsNullOrWhiteSpace(customffMpegPath))
{
info.EncoderPath = customffMpegPath;
}
if (!string.IsNullOrWhiteSpace(customffProbePath))
{
info.EncoderPath = customffProbePath;
}
return info; return info;
} }

4
MediaBrowser.Server.Startup.Common/FFMpeg/FFmpegValidator.cs
View File

@ -90,12 +90,12 @@ namespace MediaBrowser.Server.Startup.Common.FFMpeg
"libx265", "libx265",
"mpeg4", "mpeg4",
"msmpeg4", "msmpeg4",
"libvpx", //"libvpx",
//"libvpx-vp9", //"libvpx-vp9",
"aac", "aac",
"ac3", "ac3",
"libmp3lame", "libmp3lame",
"libvorbis", //"libvorbis",
"srt" "srt"
}; };

15
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -434,11 +434,18 @@ namespace MediaBrowser.WebDashboard.Api
var versionString = !string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase) ? "?v=" + version : string.Empty; var versionString = !string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase) ? "?v=" + version : string.Empty;
var files = new List<string> var files = new List<string>();
if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
{ {
"bower_components/requirejs/require.js" + versionString, files.Add("bower_components/requirejs/require.js");
"scripts/site.js" + versionString }
}; else
{
files.Add("bower_components" + version + "/requirejs/require.js");
}
files.Add("scripts/site.js" + versionString);
if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase)) if (string.Equals(mode, "cordova", StringComparison.OrdinalIgnoreCase))
{ {