Merge pull request #2408 from MediaBrowser/dev

Dev

1 files changed, 2 insertions, 16 deletions

diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs
index 47df12e1b..fb9c3d213 100644
--- a/MediaBrowser.Controller/Entities/Video.cs
+++ b/MediaBrowser.Controller/Entities/Video.cs
@@ -649,22 +649,8 @@ namespace MediaBrowser.Controller.Entities
                 }
             }
 
-            try
-            {
-                var bitrate = i.TotalBitrate ??
-                    info.MediaStreams.Where(m => m.Type != MediaStreamType.Subtitle && !string.Equals(m.Codec, "mjpeg", StringComparison.OrdinalIgnoreCase))
-                    .Select(m => m.BitRate ?? 0)
-                    .Sum();
-
-                if (bitrate > 0)
-                {
-                    info.Bitrate = bitrate;
-                }
-            }
-            catch (OverflowException ex)
-            {
-                Logger.ErrorException("Error calculating total bitrate", ex);
-            }
+            info.Bitrate = i.TotalBitrate;
+            info.InferTotalBitrate();
 
             return info;
         }