lgladsden/jellyfin-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2461 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-02-09 19:43:33 -05:00 committed by GitHub
commit dc76482147
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs
View File

@ -155,7 +155,6 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
var durationParam = " -t " + _mediaEncoder.GetTimeParameter(duration.Ticks); var durationParam = " -t " + _mediaEncoder.GetTimeParameter(duration.Ticks);
var inputModifiers = "-fflags +genpts -async 1 -vsync -1"; var inputModifiers = "-fflags +genpts -async 1 -vsync -1";
var mapArgs = string.Equals(OutputFormat, "mkv", StringComparison.OrdinalIgnoreCase) ? "-map 0" : "-sn"; var mapArgs = string.Equals(OutputFormat, "mkv", StringComparison.OrdinalIgnoreCase) ? "-map 0" : "-sn";
mapArgs = "-sn";
var commandLineArgs = "-i \"{0}\"{4} " + mapArgs + " {2} -map_metadata -1 -threads 0 {3} -y \"{1}\""; var commandLineArgs = "-i \"{0}\"{4} " + mapArgs + " {2} -map_metadata -1 -threads 0 {3} -y \"{1}\"";
long startTimeTicks = 0; long startTimeTicks = 0;

50
MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs
View File

@ -1486,33 +1486,33 @@ namespace MediaBrowser.MediaEncoding.Encoder
//inputModifier += " -noaccurate_seek"; //inputModifier += " -noaccurate_seek";
} }
//if (!string.IsNullOrWhiteSpace(state.InputContainer)) if (!string.IsNullOrWhiteSpace(state.InputContainer))
//{ {
// var inputFormat = GetInputFormat(state.InputContainer); var inputFormat = GetInputFormat(state.InputContainer);
// if (!string.IsNullOrWhiteSpace(inputFormat)) if (!string.IsNullOrWhiteSpace(inputFormat))
// { {
// inputModifier += " -f " + inputFormat; inputModifier += " -f " + inputFormat;
// } }
//} }
//if (state.RunTimeTicks.HasValue) if (state.RunTimeTicks.HasValue)
//{ {
// foreach (var stream in state.MediaSource.MediaStreams) foreach (var stream in state.MediaSource.MediaStreams)
// { {
// if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle) if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle)
// { {
// if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1) if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1)
// { {
// var decoder = GetDecoderFromCodec(stream.Codec); var decoder = GetDecoderFromCodec(stream.Codec);
// if (!string.IsNullOrWhiteSpace(decoder)) if (!string.IsNullOrWhiteSpace(decoder))
// { {
// inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder; inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder;
// } }
// } }
// } }
// } }
//} }
} }
return inputModifier; return inputModifier;