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.Controller/MediaEncoding | |
| parent | 9aab559331ec90a92c69681f03fea0803aa7adb8 (diff) | |
| parent | d54f03514d630d29d7927ab20af53c2f6e48ad5b (diff) | |
Merge pull request #2219 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs index f97fe9560..866a08aa1 100644 --- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs +++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs @@ -84,7 +84,7 @@ namespace MediaBrowser.Controller.MediaEncoding /// <param name="inputFiles">The input files.</param> /// <param name="protocol">The protocol.</param> /// <returns>System.String.</returns> - string GetProbeSizeArgument(string[] inputFiles, MediaProtocol protocol); + string GetProbeSizeAndAnalyzeDurationArgument(string[] inputFiles, MediaProtocol protocol); /// <summary> /// Gets the input argument. diff --git a/MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs b/MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs index ca0c2fdbb..9ff7567d4 100644 --- a/MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs +++ b/MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs @@ -15,6 +15,7 @@ namespace MediaBrowser.Controller.MediaEncoding public IIsoMount MountedIso { get; set; } public VideoType VideoType { get; set; } public List<string> PlayableStreamFileNames { get; set; } + public int AnalyzeDurationSections { get; set; } public MediaInfoRequest() { |