Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 16 insertions, 0 deletions

diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
index 8bdf597a1..9f29b2db1 100644
--- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
@@ -431,6 +431,22 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
 
             cancellationToken.ThrowIfCancellationRequested();
 
+            if (result.streams != null)
+            {
+                // Normalize aspect ratio if invalid
+                foreach (var stream in result.streams)
+                {
+                    if (string.Equals(stream.display_aspect_ratio, "0:1", StringComparison.OrdinalIgnoreCase))
+                    {
+                        stream.display_aspect_ratio = string.Empty;
+                    }
+                    if (string.Equals(stream.sample_aspect_ratio, "0:1", StringComparison.OrdinalIgnoreCase))
+                    {
+                        stream.sample_aspect_ratio = string.Empty;
+                    }
+                }
+            }
+
             if (extractChapters && !string.IsNullOrEmpty(standardError))
             {
                 AddChapters(result, standardError);