Merge remote-tracking branch 'upstream/release-10.2.z' into newmaser

This commit is contained in:
Bond-009
2019-02-17 10:38:44 +01:00
35 changed files with 587 additions and 420 deletions

View File

@@ -297,7 +297,7 @@ namespace MediaBrowser.Model.Dlna
int? inputAudioChannels = audioStream?.Channels;
int? inputAudioBitrate = audioStream?.BitDepth;
int? inputAudioSampleRate = audioStream?.SampleRate;
int? inputAudioBitDepth = audioStream.BitDepth;
int? inputAudioBitDepth = audioStream?.BitDepth;
if (directPlayMethods.Count() > 0)
{