diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-04-03 01:31:45 -0400 |
|---|---|---|
| committer | Luke <luke.pulverenti@gmail.com> | 2016-04-03 01:31:45 -0400 |
| commit | a1b9db336c813cb7c06e9f1a861dfbd8c30fb225 (patch) | |
| tree | 8906d20a4f469b74b10bebab3e24b4c37d280b66 /MediaBrowser.Model | |
| parent | fc4876cfd2b921de06792bd1c9839bb54991f383 (diff) | |
| parent | 6ba2a9ebd2cc42d83b8bbef959b8d5b71c0fee4d (diff) | |
Merge pull request #1622 from MediaBrowser/dev
update subtitle encoding
Diffstat (limited to 'MediaBrowser.Model')
| -rw-r--r-- | MediaBrowser.Model/Dlna/StreamBuilder.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Model/Dlna/StreamBuilder.cs b/MediaBrowser.Model/Dlna/StreamBuilder.cs index a080011eca..e5477cfd03 100644 --- a/MediaBrowser.Model/Dlna/StreamBuilder.cs +++ b/MediaBrowser.Model/Dlna/StreamBuilder.cs @@ -776,7 +776,7 @@ namespace MediaBrowser.Model.Dlna } // Look for an external or hls profile that matches the stream type (text/graphical) and doesn't require conversion - return GetExternalSubtitleProfile(subtitleStream, subtitleProfiles, playMethod, false) ?? GetExternalSubtitleProfile(subtitleStream, subtitleProfiles, playMethod, false) ?? new SubtitleProfile + return GetExternalSubtitleProfile(subtitleStream, subtitleProfiles, playMethod, false) ?? GetExternalSubtitleProfile(subtitleStream, subtitleProfiles, playMethod, true) ?? new SubtitleProfile { Method = SubtitleDeliveryMethod.Encode, Format = subtitleStream.Codec |