michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2552 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2017-03-29 01:03:18 -04:00 committed by GitHub
commit 21705ae425
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Common.Implementations/Net/UdpSocket.cs
View File

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

2
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

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

11
MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
View File

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