From 0951819f00d99e206cfc33dbde0eb2132cbbeaf1 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 13 Aug 2017 16:15:07 -0400
Subject: fixes #2798, fixes #2799

---
 MediaBrowser.Controller/Entities/TV/Series.cs           | 4 ++++
 MediaBrowser.Controller/Library/TVUtils.cs              | 8 ++++----
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 4 ++++
 3 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'MediaBrowser.Controller')

diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 854c1d4da..3350a6579 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -25,8 +25,12 @@ namespace MediaBrowser.Controller.Entities.TV
             RemoteTrailers = EmptyMediaUrlArray;
             LocalTrailerIds = EmptyGuidArray;
             RemoteTrailerIds = EmptyGuidArray;
+            AirDays = new DayOfWeek[] { };
         }
 
+        public DayOfWeek[] AirDays { get; set; }
+        public string AirTime { get; set; }
+
         [IgnoreDataMember]
         public override bool SupportsAddingToPlaylist
         {
diff --git a/MediaBrowser.Controller/Library/TVUtils.cs b/MediaBrowser.Controller/Library/TVUtils.cs
index 29421ebaf..7c82ec293 100644
--- a/MediaBrowser.Controller/Library/TVUtils.cs
+++ b/MediaBrowser.Controller/Library/TVUtils.cs
@@ -22,13 +22,13 @@ namespace MediaBrowser.Controller.Library
         /// </summary>
         /// <param name="day">The day.</param>
         /// <returns>List{DayOfWeek}.</returns>
-        public static List<DayOfWeek> GetAirDays(string day)
+        public static DayOfWeek[] GetAirDays(string day)
         {
             if (!string.IsNullOrWhiteSpace(day))
             {
                 if (day.Equals("Daily", StringComparison.OrdinalIgnoreCase))
                 {
-                    return new List<DayOfWeek>
+                    return new DayOfWeek[]
                                {
                                    DayOfWeek.Sunday,
                                    DayOfWeek.Monday,
@@ -44,13 +44,13 @@ namespace MediaBrowser.Controller.Library
 
                 if (Enum.TryParse(day, true, out value))
                 {
-                    return new List<DayOfWeek>
+                    return new DayOfWeek[]
                                {
                                    value
                                };
                 }
 
-                return new List<DayOfWeek>();
+                return new DayOfWeek[]{};
             }
             return null;
         }
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 84cae884d..823c893ea 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -211,6 +211,10 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 return null;
             }
+            if (string.Equals(container, "rtp", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
 
             // Seeing reported failures here, not sure yet if this is related to specfying input format
             if (string.Equals(container, "m4v", StringComparison.OrdinalIgnoreCase))
-- 
cgit v1.2.3