removed default framerate from hls

1 files changed, 2 insertions, 21 deletions

diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
index 6b4ca6146..080ab9c7e 100644
--- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs
@@ -142,29 +142,10 @@ namespace MediaBrowser.Api.Playback.Hls
                 args += GetOutputSizeParam(state, codec, performSubtitleConversion);
             }
 
-            // Get the output framerate based on the FrameRate param
-            var framerate = state.VideoRequest.Framerate ?? 0;
-
-            // We have to supply a framerate for hls, so if it's null, account for that here
-            if (state.VideoStream != null)
+            if (state.VideoRequest.Framerate.HasValue)
             {
-                if (framerate.Equals(0))
-                {
-                    framerate = state.VideoStream.AverageFrameRate ?? 0;
-                }
-                if (framerate.Equals(0))
-                {
-                    framerate = state.VideoStream.RealFrameRate ?? 0;
-                }
+                args += string.Format(" -r {0}", state.VideoRequest.Framerate.Value);
             }
-            if (framerate.Equals(0))
-            {
-                framerate = 23.976;
-            }
-
-            framerate = Math.Round(framerate);
-
-            args += string.Format(" -r {0}", framerate);
 
             args += " -vsync vfr";