aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
diff options
context:
space:
mode:
authorArtiume <siderite@gmail.com>2019-12-19 20:51:45 -0500
committerGitHub <noreply@github.com>2019-12-19 20:51:45 -0500
commit6a6e02e1ec23df06ab961d2c974263450871ae71 (patch)
treeb3dcb8ed252a4e55ac580c1844836758fe7ef2ab /MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
parentd2e9ce76441dbe2f1cdd0529ff835931af4a1046 (diff)
parent06dfa2e687304874d4c8de8f7c95354b3d51225c (diff)
Merge pull request #3 from jellyfin/master
nightly, big one
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs4
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
index d032a849e..37f0b11a7 100644
--- a/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
+++ b/MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
@@ -15,6 +15,9 @@ namespace MediaBrowser.Controller.MediaEncoding
/// </summary>
public interface IMediaEncoder : ITranscoderSupport
{
+ /// <summary>
+ /// The location of the discovered FFmpeg tool.
+ /// </summary>
FFmpegLocation EncoderLocation { get; }
/// <summary>
@@ -97,7 +100,6 @@ namespace MediaBrowser.Controller.MediaEncoding
void UpdateEncoderPath(string path, string pathType);
bool SupportsEncoder(string encoder);
- string[] GetPlayableStreamFileNames(string path, VideoType videoType);
IEnumerable<string> GetPrimaryPlaylistVobFiles(string path, IIsoMount isoMount, uint? titleNumber);
}
}