Merge pull request #1909 from KerryRJ/FixDvdsFailingToPlay

Fix System.NullReferenceException when playing Dvds copied to HDD
5 years ago · fdb0c3a1df
parent e3f1f62a8b ef3df7baaf
commit fdb0c3a1df
1 changed files with 9 additions and 9 deletions
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@ -1173,17 +1173,17 @@ namespace MediaBrowser.Controller.MediaEncoding
                {
                    bitrate = GetMinBitrate(videoStream.BitRate.Value, bitrate.Value);
                }
-            }
-
-            if (bitrate.HasValue)
-            {
-                var inputVideoCodec = videoStream.Codec;
-                bitrate = ScaleBitrate(bitrate.Value, inputVideoCodec, outputVideoCodec);

-                // If a max bitrate was requested, don't let the scaled bitrate exceed it
-                if (request.VideoBitRate.HasValue)
+                if (bitrate.HasValue)
                {
-                    bitrate = Math.Min(bitrate.Value, request.VideoBitRate.Value);
+                    var inputVideoCodec = videoStream.Codec;
+                    bitrate = ScaleBitrate(bitrate.Value, inputVideoCodec, outputVideoCodec);
+
+                    // If a max bitrate was requested, don't let the scaled bitrate exceed it
+                    if (request.VideoBitRate.HasValue)
+                    {
+                        bitrate = Math.Min(bitrate.Value, request.VideoBitRate.Value);
+                    }
                }
            }