aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.MediaEncoding/Encoder
diff options
context:
space:
mode:
authorShadowghost <Ghost_of_Stone@web.de>2026-04-19 10:23:34 +0200
committerShadowghost <Ghost_of_Stone@web.de>2026-04-19 10:23:34 +0200
commite71bb7e9047748a0dca48c83c16c7a104545840e (patch)
tree2c07a728044588efbaeb47c073c26659518817bc /MediaBrowser.MediaEncoding/Encoder
parent5b4882c10224a664359e3ce97e44e403523e8546 (diff)
parent96269ff177f6851041f15d7df365587f1f4a9ce8 (diff)
Merge remote-tracking branch 'upstream/master' into perf-rebased
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder')
-rw-r--r--MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
index 73c5b88c8b..770965cab3 100644
--- a/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
@@ -1331,8 +1331,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
public bool CanExtractSubtitles(string codec)
{
- // TODO is there ever a case when a subtitle can't be extracted??
- return true;
+ return _configurationManager.GetEncodingOptions().EnableSubtitleExtraction;
}
private sealed class ProcessWrapper : IDisposable