alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-06-12 18:50:23 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1346 from MediaBrowser/master

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

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);
// 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;
}

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

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