Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1643 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-04-12 13:43:09 -04:00
commit ad3a6465eb
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Model/Dlna/StreamBuilder.cs
View File

@ -509,6 +509,10 @@ namespace MediaBrowser.Model.Dlna
private int GetAudioBitrate(int? maxTotalBitrate, int? targetAudioChannels, string targetAudioCodec, MediaStream audioStream) private int GetAudioBitrate(int? maxTotalBitrate, int? targetAudioChannels, string targetAudioCodec, MediaStream audioStream)
{ {
var defaultBitrate = 128000; var defaultBitrate = 128000;
if (StringHelper.EqualsIgnoreCase(targetAudioCodec, "ac3"))
{
defaultBitrate = 192000;
}
if (targetAudioChannels.HasValue) if (targetAudioChannels.HasValue)
{ {

2
MediaBrowser.Server.Implementations/Library/SearchEngine.cs
View File

@ -92,7 +92,7 @@ namespace MediaBrowser.Server.Implementations.Library
throw new ArgumentNullException("searchTerm"); throw new ArgumentNullException("searchTerm");
} }
searchTerm = searchTerm.RemoveDiacritics(); searchTerm = searchTerm.Trim().RemoveDiacritics();
var terms = GetWords(searchTerm); var terms = GetWords(searchTerm);

4
MediaBrowser.Server.Implementations/LiveTv/TunerHosts/HdHomerun/HdHomerunHost.cs
View File

@ -354,8 +354,8 @@ namespace MediaBrowser.Server.Implementations.LiveTv.TunerHosts.HdHomerun
BufferMs = 0, BufferMs = 0,
Container = "ts", Container = "ts",
Id = profile, Id = profile,
SupportsDirectPlay = true, SupportsDirectPlay = false,
SupportsDirectStream = true, SupportsDirectStream = false,
SupportsTranscoding = true SupportsTranscoding = true
}; };

1
MediaBrowser.WebDashboard/packages.config
View File

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="CommonIO" version="1.0.0.9" targetFramework="net45" /> <package id="CommonIO" version="1.0.0.9" targetFramework="net45" />
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.249" targetFramework="net45" />
<package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" /> <package id="Patterns.Logging" version="1.0.0.2" targetFramework="net45" />
<package id="WebMarkupMin.Core" version="1.0.1" targetFramework="net45" /> <package id="WebMarkupMin.Core" version="1.0.1" targetFramework="net45" />
</packages> </packages>