Merge branch 'master' into port-async-migration-routines

# Conflicts:
#	Jellyfin.Server/Migrations/Routines/20260915120000_MigrateRatingLevels.cs

2 files changed, 9 insertions, 3 deletions

diff --git a/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs b/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs
index f631c471f6..17ab378ef7 100644
--- a/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs
+++ b/MediaBrowser.MediaEncoding/Probing/MediaStreamInfo.cs
@@ -198,10 +198,10 @@ namespace MediaBrowser.MediaEncoding.Probing
         public string? CodecTag { get; set; }
 
         /// <summary>
-        /// Gets or sets the codec_tag_string?.
+        /// Gets or sets the codec_tag_string.
         /// </summary>
-        /// <value>The codec_tag_string?.</value>
-        [JsonPropertyName("codec_tag_string?")]
+        /// <value>The codec_tag_string.</value>
+        [JsonPropertyName("codec_tag_string")]
         public string? CodecTagString { get; set; }
 
         /// <summary>
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 5533e55223..c9d618c84a 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -1110,6 +1110,12 @@ namespace MediaBrowser.MediaEncoding.Probing
                     && width > 0
                     && height > 0))
             {
+                // Live TV and other early probes can report neither a usable display aspect ratio nor the frame size
+                if (info.Width is not > 0 || info.Height is not > 0)
+                {
+                    return original;
+                }
+
                 width = info.Width.Value;
                 height = info.Height.Value;
             }