aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
diff options
context:
space:
mode:
authorAndrew Rabert <6550543+nvllsvm@users.noreply.github.com>2019-01-20 16:59:16 -0500
committerGitHub <noreply@github.com>2019-01-20 16:59:16 -0500
commitc8dd72886b265630606ef1c9e061f32995c9b841 (patch)
tree3cf294bce75c013ca3a8d94da0e5e362a615bb1b /MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
parentc64cc733d2717d220a1110601abcd9072fffe67e (diff)
parente8cf72e925f8e6dfa3c5831b765919382af6ca3e (diff)
Merge pull request #636 from cvium/fix_subtitle_conversion_direct_streaming
Allow subtitle extraction and conversion in direct streaming
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 63642b571..a8aefcddf 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -1018,7 +1018,8 @@ namespace MediaBrowser.MediaEncoding.Encoder
public bool CanExtractSubtitles(string codec)
{
- return false;
+ // TODO is there ever a case when a subtitle can't be extracted??
+ return true;
}
private class ProcessWrapper : IDisposable