Merge branch 'dev' into cleanup

1 files changed, 2 insertions, 2 deletions

diff --git a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
index 7ef7b81e6..3e17d0b74 100644
--- a/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/BaseHlsService.cs
@@ -269,7 +269,7 @@ namespace MediaBrowser.Api.Playback.Hls
             {
                 var outputTsArg = Path.Combine(FileSystem.GetDirectoryName(outputPath), Path.GetFileNameWithoutExtension(outputPath)) + "%d" + GetSegmentFileExtension(state.Request);
 
-                var timeDeltaParam = String.Empty;
+                var timeDeltaParam = string.Empty;
 
                 var segmentFormat = GetSegmentFileExtension(state.Request).TrimStart('.');
                 if (string.Equals(segmentFormat, "ts", StringComparison.OrdinalIgnoreCase))
@@ -296,7 +296,7 @@ namespace MediaBrowser.Api.Playback.Hls
                 ).Trim();
             }
 
-            // add when stream copying? 
+            // add when stream copying?
             // -avoid_negative_ts make_zero -fflags +genpts
 
             var args = string.Format("{0} {1} {2} -map_metadata -1 -map_chapters -1 -threads {3} {4} {5} -max_delay 5000000 -avoid_negative_ts disabled -start_at_zero {6} -hls_time {7} -individual_header_trailer 0 -start_number {8} -hls_list_size {9}{10} -y \"{11}\"",