diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-12 15:03:56 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2016-01-12 15:03:56 -0500 |
| commit | 21f1d96ee902b897b5242be130783571bdfc2226 (patch) | |
| tree | b861aa966c7521f1faf8a0eec745943bb0037b03 /MediaBrowser.Controller/MediaEncoding | |
| parent | d6614728448a82bece05738b1a24f1bff861687e (diff) | |
| parent | d06b78d9398330b98828d752d7fe49232ffdb3d0 (diff) | |
Merge branch 'dev' into beta
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs index 427af6f6d7..76ef054de0 100644 --- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs +++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs @@ -35,9 +35,10 @@ namespace MediaBrowser.Controller.MediaEncoding /// Extracts the audio image. /// </summary> /// <param name="path">The path.</param> + /// <param name="imageStreamIndex">Index of the image stream.</param> /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{Stream}.</returns> - Task<Stream> ExtractAudioImage(string path, CancellationToken cancellationToken); + Task<Stream> ExtractAudioImage(string path, int? imageStreamIndex, CancellationToken cancellationToken); /// <summary> /// Extracts the video image. diff --git a/MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs b/MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs index 24df7b8854..ca0c2fdbb4 100644 --- a/MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs +++ b/MediaBrowser.Controller/MediaEncoding/MediaInfoRequest.cs @@ -15,7 +15,6 @@ namespace MediaBrowser.Controller.MediaEncoding public IIsoMount MountedIso { get; set; } public VideoType VideoType { get; set; } public List<string> PlayableStreamFileNames { get; set; } - public bool ExtractKeyFrameInterval { get; set; } public MediaInfoRequest() { |