Merge pull request #2552 from MediaBrowser/dev

Dev

Emby.Common.Implementations/Net/UdpSocket.cs

@@ -49,7 +49,7 @@ namespace Emby.Common.Implementations.Net
 
         private void InitReceiveSocketAsyncEventArgs()
         {
-            var receiveBuffer = new byte[81920];
+            var receiveBuffer = new byte[8192];
             _receiveSocketAsyncEventArgs.SetBuffer(receiveBuffer, 0, receiveBuffer.Length);
             _receiveSocketAsyncEventArgs.Completed += _receiveSocketAsyncEventArgs_Completed;
 

Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs

@@ -2575,7 +2575,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
                 list.Add(new VirtualFolderInfo
                 {
                     Locations = new List<string> { customPath },
-                    Name = "Recorded Series",
+                    Name = "Recorded Shows",
                     CollectionType = CollectionType.TvShows
                 });
             }

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -164,6 +164,10 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 return null;
             }
+            if (string.Equals(container, "mts", StringComparison.OrdinalIgnoreCase))
+            {
+                return null;
+            }
             if (string.Equals(container, "vob", StringComparison.OrdinalIgnoreCase))
             {
                 return null;
@@ -1709,6 +1713,13 @@ namespace MediaBrowser.Controller.MediaEncoding
                                 return "-c:v h264_qsv ";
                             }
                             break;
+                        //case "hevc":
+                        //case "h265":
+                        //    if (_mediaEncoder.SupportsDecoder("hevc_qsv"))
+                        //    {
+                        //        return "-c:v hevc_qsv ";
+                        //    }
+                        //    break;
                         case "mpeg2video":
                             if (_mediaEncoder.SupportsDecoder("mpeg2_qsv"))
                             {