1 files changed, 18 insertions, 1 deletions
diff --git a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
index 1e91a8198..023100f44 100644
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -53,7 +53,7 @@ namespace MediaBrowser.MediaEncoding.Probing
 
             if (data.format != null)
             {
-                info.Container = data.format.format_name;
+                info.Container = NormalizeFormat(data.format.format_name);
 
                 if (!string.IsNullOrEmpty(data.format.bit_rate))
                 {
@@ -195,6 +195,23 @@ namespace MediaBrowser.MediaEncoding.Probing
             return info;
         }
 
+        private string NormalizeFormat(string format)
+        {
+            if (string.IsNullOrWhiteSpace(format))
+            {
+                return null;
+            }
+
+            if (string.Equals(format, "mpegvideo", StringComparison.OrdinalIgnoreCase))
+            {
+                return "mpeg";
+            }
+
+            format = format.Replace("matroska", "mkv", StringComparison.OrdinalIgnoreCase);
+
+            return format;
+        }
+
         private int? GetEstimatedAudioBitrate(string codec, int? channels)
         {
             if (!channels.HasValue)