update merge

Emby.Drawing/ImageProcessor.cs

@@ -819,4 +819,4 @@ namespace Emby.Drawing
             }
         }
     }
-}
+}

MediaBrowser.Api/Devices/DeviceService.cs

@@ -158,4 +158,4 @@ namespace MediaBrowser.Api.Devices
             }
         }
     }
-}
+}

MediaBrowser.Api/Playback/Hls/BaseHlsService.cs

@@ -23,8 +23,7 @@ namespace MediaBrowser.Api.Playback.Hls
     /// </summary>
     public abstract class BaseHlsService : BaseStreamingService
     {
-        protected BaseHlsService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer)
-            : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer)
+        protected BaseHlsService(IServerConfigurationManager serverConfig, IUserManager userManager, ILibraryManager libraryManager, IIsoManager isoManager, IMediaEncoder mediaEncoder, IFileSystem fileSystem, IDlnaManager dlnaManager, ISubtitleEncoder subtitleEncoder, IDeviceManager deviceManager, IMediaSourceManager mediaSourceManager, IZipClient zipClient, IJsonSerializer jsonSerializer) : base(serverConfig, userManager, libraryManager, isoManager, mediaEncoder, fileSystem, dlnaManager, subtitleEncoder, deviceManager, mediaSourceManager, zipClient, jsonSerializer)
         {
         }
 
@@ -151,7 +150,7 @@ namespace MediaBrowser.Api.Playback.Hls
             {
                 ApiEntryPoint.Instance.OnTranscodeEndRequest(job);
             }
-
+            
             return ResultFactory.GetResult(playlistText, MimeTypes.GetMimeType("playlist.m3u8"), new Dictionary<string, string>());
         }
 
@@ -318,4 +317,4 @@ namespace MediaBrowser.Api.Playback.Hls
             return false;
         }
     }
-}
+}

MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs

@@ -989,4 +989,4 @@ namespace MediaBrowser.Api.Playback.Hls
             return base.CanStreamCopyVideo(request, videoStream);
         }
     }
-}
+}

MediaBrowser.Common/ScheduledTasks/IntervalTrigger.cs

@@ -104,4 +104,4 @@ namespace MediaBrowser.Common.ScheduledTasks
             }
         }
     }
-}
+}

MediaBrowser.Controller/Entities/Audio/MusicAlbum.cs

@@ -140,4 +140,4 @@ namespace MediaBrowser.Controller.Entities.Audio
             return id;
         }
     }
-}
+}

MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

@@ -879,4 +879,4 @@ namespace MediaBrowser.MediaEncoding.Encoder
             }
         }
     }
-}
+}

MediaBrowser.Model/Configuration/ServerConfiguration.cs

@@ -103,7 +103,7 @@ namespace MediaBrowser.Model.Configuration
         /// </summary>
         /// <value><c>true</c> if [disable startup scan]; otherwise, <c>false</c>.</value>
         public bool DisableStartupScan { get; set; }
-
+        
         /// <summary>
         /// Gets or sets a value indicating whether [enable library metadata sub folder].
         /// </summary>
@@ -223,7 +223,7 @@ namespace MediaBrowser.Model.Configuration
         public bool EnableWindowsShortcuts { get; set; }
 
         public bool EnableVideoFrameByFrameAnalysis { get; set; }
-
+        
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>
@@ -581,4 +581,4 @@ namespace MediaBrowser.Model.Configuration
             };
         }
     }
-}
+}

MediaBrowser.Model/Dlna/StreamBuilder.cs

@@ -1042,4 +1042,4 @@ namespace MediaBrowser.Model.Dlna
             return true;
         }
     }
-}
+}

MediaBrowser.Model/Net/MimeTypes.cs

@@ -321,4 +321,4 @@ namespace MediaBrowser.Model.Net
             return null;
         }
     }
-}
+}