diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2022-03-25 10:13:58 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-25 10:13:58 -0400 |
| commit | c229f3ae0a0991e5c764706b69cf6cb08c4a19e8 (patch) | |
| tree | 499d50c6fd624f15cc5f90c3523bbbe29c318687 | |
| parent | 8197e5921efb41718dc41fd8269ae2a41aacf957 (diff) | |
| parent | 3cea6c61f3e71bc933c36bfa4b8e1059aa9f7616 (diff) | |
Merge pull request #7333 from eyezak/hls/audio-bitstream-fmp4
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index c09f00d7d..633ba2d76 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs @@ -969,6 +969,7 @@ namespace MediaBrowser.Controller.MediaEncoding // Apply aac_adtstoasc bitstream filter when media source is in mpegts. if (string.Equals(segmentFormat, "mp4", StringComparison.OrdinalIgnoreCase) && (string.Equals(mediaSourceContainer, "mpegts", StringComparison.OrdinalIgnoreCase) + || string.Equals(mediaSourceContainer, "aac", StringComparison.OrdinalIgnoreCase) || string.Equals(mediaSourceContainer, "hls", StringComparison.OrdinalIgnoreCase))) { bitStreamArgs = GetBitStreamArgs(state.AudioStream); @@ -1696,7 +1697,8 @@ namespace MediaBrowser.Controller.MediaEncoding // Source and target codecs must match if (string.IsNullOrEmpty(videoStream.Codec) - || !state.SupportedVideoCodecs.Contains(videoStream.Codec, StringComparison.OrdinalIgnoreCase)) + || (state.SupportedVideoCodecs.Length != 0 + && !state.SupportedVideoCodecs.Contains(videoStream.Codec, StringComparison.OrdinalIgnoreCase))) { return false; } |