Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

1 files changed, 6 insertions, 6 deletions

diff --git a/MediaBrowser.Controller/Dlna/TranscodingProfile.cs b/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
index 1073f74aa..007cb632e 100644
--- a/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
+++ b/MediaBrowser.Controller/Dlna/TranscodingProfile.cs
@@ -1,5 +1,4 @@
-using System.Collections.Generic;
-
+
 namespace MediaBrowser.Controller.Dlna
 {
     public class TranscodingProfile
@@ -15,12 +14,14 @@ namespace MediaBrowser.Controller.Dlna
 
         public TranscodeSeekInfo TranscodeSeekInfo { get; set; }
 
-        public List<TranscodingSetting> Settings { get; set; }
+        public TranscodingSetting[] Settings { get; set; }
 
         public TranscodingProfile()
         {
-            Settings = new List<TranscodingSetting>();
+            Settings = new TranscodingSetting[] { };
         }
+
+        public bool EnableMpegtsM2TsMode { get; set; }
     }
 
     public class TranscodingSetting
@@ -31,8 +32,7 @@ namespace MediaBrowser.Controller.Dlna
 
     public enum TranscodingSettingType
     {
-        Profile = 0,
-        MaxAudioChannels = 1
+        VideoProfile = 0
     }
 
     public enum TranscodeSeekInfo