Merge branch 'master' into fix/livetv-channel-icon-refresh

Resolve GuideManager conflict by keeping LiveTvChannelImageHelper so
channel icons re-fetch on every guide refresh, including when the URL
is unchanged.

1 files changed, 7 insertions, 1 deletions

diff --git a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
index 975c2b8161..fa2085ca6f 100644
--- a/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
+++ b/MediaBrowser.MediaEncoding/Probing/FFProbeHelpers.cs
@@ -76,7 +76,13 @@ namespace MediaBrowser.MediaEncoding.Probing
         /// <returns>Dictionary{System.StringSystem.String}.</returns>
         private static Dictionary<string, string?> ConvertDictionaryToCaseInsensitive(IReadOnlyDictionary<string, string?> dict)
         {
-            return new Dictionary<string, string?>(dict, StringComparer.OrdinalIgnoreCase);
+            var result = new Dictionary<string, string?>(dict.Count, StringComparer.OrdinalIgnoreCase);
+            foreach (var (key, value) in dict)
+            {
+                result.TryAdd(key, value);
+            }
+
+            return result;
         }
     }
 }