From 7ea3719a2dfbdbe18a6b83ea5532f061c238cbc4 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 20 Apr 2017 16:17:52 -0400
Subject: 3.2.12.11

---
 Emby.Server.Implementations/Library/LibraryManager.cs  | 2 +-
 Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs | 4 ----
 Emby.Server.Implementations/LiveTv/LiveTvManager.cs    | 1 -
 3 files changed, 1 insertion(+), 6 deletions(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index fc2299907..16a73f392 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2577,7 +2577,7 @@ namespace Emby.Server.Implementations.Library
                 }).OrderBy(i => i.Path).ToList();
         }
 
-        private static readonly string[] ExtrasSubfolderNames = new[] { "extras", "specials", "shorts", "scenes", "featurettes", "behind the scenes", "deleted scenes" };
+        private static readonly string[] ExtrasSubfolderNames = new[] { "extras", "specials", "shorts", "scenes", "featurettes", "behind the scenes", "deleted scenes", "interviews" };
 
         public IEnumerable<Video> FindExtras(BaseItem owner, List<FileSystemMetadata> fileSystemChildren, IDirectoryService directoryService)
         {
diff --git a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
index 4efef4470..925dec71c 100644
--- a/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveStreamHelper.cs
@@ -30,8 +30,6 @@ namespace Emby.Server.Implementations.LiveTv
 
             var now = DateTime.UtcNow;
 
-            var allowVideoStreamCopy = mediaSource.MediaStreams.Any(i => i.Type == MediaStreamType.Video && i.AllowStreamCopy);
-
             var info = await _mediaEncoder.GetMediaInfo(new MediaInfoRequest
             {
                 InputPath = mediaSource.Path,
@@ -76,8 +74,6 @@ namespace Emby.Server.Implementations.LiveTv
             var videoStream = mediaSource.MediaStreams.FirstOrDefault(i => i.Type == MediaBrowser.Model.Entities.MediaStreamType.Video);
             if (videoStream != null)
             {
-                videoStream.AllowStreamCopy = allowVideoStreamCopy;
-
                 if (!videoStream.BitRate.HasValue)
                 {
                     var width = videoStream.Width ?? 1920;
diff --git a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
index eee4a2725..a898d3084 100644
--- a/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
+++ b/Emby.Server.Implementations/LiveTv/LiveTvManager.cs
@@ -490,7 +490,6 @@ namespace Emby.Server.Implementations.LiveTv
                     if (stream.Type == MediaStreamType.Video)
                     {
                         stream.IsInterlaced = true;
-                        stream.AllowStreamCopy = false;
                     }
                 }
             }
-- 
cgit v1.2.3