diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-11 02:47:51 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-11 02:47:51 -0400 |
| commit | 88150e461c4b554630d0bfaac68a7d8e13954eff (patch) | |
| tree | c54fcc5b6eed59b3a76e9d403732dfcc6b2c0b06 /MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs | |
| parent | 9aab559331ec90a92c69681f03fea0803aa7adb8 (diff) | |
| parent | d54f03514d630d29d7927ab20af53c2f6e48ad5b (diff) | |
Merge pull request #2219 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs index f1e2f7241..c7b78aae3 100644 --- a/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs +++ b/MediaBrowser.MediaEncoding/Encoder/BaseEncoder.cs @@ -431,10 +431,10 @@ namespace MediaBrowser.MediaEncoding.Encoder { if (state.PlayableStreamFileNames.Count > 0) { - return MediaEncoder.GetProbeSizeArgument(state.PlayableStreamFileNames.ToArray(), state.InputProtocol); + return MediaEncoder.GetProbeSizeAndAnalyzeDurationArgument(state.PlayableStreamFileNames.ToArray(), state.InputProtocol); } - return MediaEncoder.GetProbeSizeArgument(new[] { state.MediaPath }, state.InputProtocol); + return MediaEncoder.GetProbeSizeAndAnalyzeDurationArgument(new[] { state.MediaPath }, state.InputProtocol); } /// <summary> |