From 7c3c0aa940b29cba64ba241eee3cdcd7f65a9eb6 Mon Sep 17 00:00:00 2001
From: jaina heartles <me@heartles.xyz>
Date: Tue, 23 Jul 2024 15:47:38 -0700
Subject: Use subtitle cache when burning-in subs

---
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index dbb4b823e..88a1111a0 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -902,6 +902,12 @@ namespace MediaBrowser.MediaEncoding.Subtitles
             }
         }
 
+        public async Task<string> GetSubtitleFilePath(MediaStream subtitleStream, MediaSourceInfo mediaSource, CancellationToken cancellationToken)
+        {
+            var info = await GetReadableFile(mediaSource, subtitleStream, cancellationToken);
+            return info.Path;
+        }
+
         /// <inheritdoc />
         public void Dispose()
         {
-- 
cgit v1.2.3


From d2c2dcd53c24938c59061de4f826f59e67d8ff15 Mon Sep 17 00:00:00 2001
From: oxixes <38050447+oxixes@users.noreply.github.com>
Date: Wed, 11 Sep 2024 11:43:02 +0200
Subject: Solve CodeQL issue

---
 MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs')

diff --git a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
index 88a1111a0..a731d4785 100644
--- a/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
+++ b/MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
@@ -904,7 +904,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
 
         public async Task<string> GetSubtitleFilePath(MediaStream subtitleStream, MediaSourceInfo mediaSource, CancellationToken cancellationToken)
         {
-            var info = await GetReadableFile(mediaSource, subtitleStream, cancellationToken);
+            var info = await GetReadableFile(mediaSource, subtitleStream, cancellationToken)
+                .ConfigureAwait(false);
             return info.Path;
         }
 
-- 
cgit v1.2.3