Merge remote-tracking branch 'upstream/master' into fmp4-hls

This commit is contained in:
nyanmisaka
2020-11-20 10:01:17 +08:00
186 changed files with 3475 additions and 3294 deletions

View File

@@ -409,7 +409,7 @@ namespace MediaBrowser.Controller.MediaEncoding
{
// Don't exceed what the encoder supports
// Seeing issues of attempting to encode to 88200
return Math.Min(44100, BaseRequest.AudioSampleRate.Value);
return BaseRequest.AudioSampleRate.Value;
}
return null;