diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-02-06 01:52:35 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 01:52:35 -0500 |
| commit | 9504146f3ca1ed51d15d7bd7e58b18bea979fbac (patch) | |
| tree | 06a367f828b3c74da880c60882d4ebd40f8f0d29 /MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs | |
| parent | 730dd523c07a06105b8e0f597c782f1dd5d80a7e (diff) | |
| parent | 4704d22944f24fd1ab5a312e3d7b1b02be838a10 (diff) | |
Merge pull request #2446 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs index 83057dba4..ed9552964 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingHelper.cs @@ -1486,33 +1486,33 @@ namespace MediaBrowser.MediaEncoding.Encoder //inputModifier += " -noaccurate_seek"; } - //if (!string.IsNullOrWhiteSpace(state.InputContainer)) - //{ - // var inputFormat = GetInputFormat(state.InputContainer); - // if (!string.IsNullOrWhiteSpace(inputFormat)) - // { - // inputModifier += " -f " + inputFormat; - // } - //} - - //if (state.RunTimeTicks.HasValue) - //{ - // foreach (var stream in state.MediaSource.MediaStreams) - // { - // if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle) - // { - // if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1) - // { - // var decoder = GetDecoderFromCodec(stream.Codec); - - // if (!string.IsNullOrWhiteSpace(decoder)) - // { - // inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder; - // } - // } - // } - // } - //} + if (!string.IsNullOrWhiteSpace(state.InputContainer)) + { + var inputFormat = GetInputFormat(state.InputContainer); + if (!string.IsNullOrWhiteSpace(inputFormat)) + { + inputModifier += " -f " + inputFormat; + } + } + + if (state.RunTimeTicks.HasValue) + { + foreach (var stream in state.MediaSource.MediaStreams) + { + if (!stream.IsExternal && stream.Type != MediaStreamType.Subtitle) + { + if (!string.IsNullOrWhiteSpace(stream.Codec) && stream.Index != -1) + { + var decoder = GetDecoderFromCodec(stream.Codec); + + if (!string.IsNullOrWhiteSpace(decoder)) + { + inputModifier += " -codec:" + stream.Index.ToString(_usCulture) + " " + decoder; + } + } + } + } + } } return inputModifier; |