CERBERUS/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-04 15:28:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

sync updates

Browse source
This commit is contained in:
Luke Pulverenti 2015-01-16 23:29:53 -05:00
parent 5c84cadb5e
commit 0e02e0559d
33 changed files with 437 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

7
MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs
View file

@ -280,13 +280,14 @@ namespace MediaBrowser.MediaEncoding.Encoder
private string GetOutputFilePath(EncodingJob state)
{
var folder = ConfigurationManager.ApplicationPaths.TranscodingTempPath;
var folder = string.IsNullOrWhiteSpace(state.Options.OutputDirectory) ?
ConfigurationManager.ApplicationPaths.TranscodingTempPath :
state.Options.OutputDirectory;
var outputFileExtension = GetOutputFileExtension(state);
var context = state.Options.Context;
var filename = state.Id + (outputFileExtension ?? string.Empty).ToLower();
return Path.Combine(folder, context.ToString().ToLower(), filename);
return Path.Combine(folder, filename);
}
protected virtual string GetOutputFileExtension(EncodingJob state)