aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api/Playback/Progressive
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-07 13:50:58 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-03-07 13:50:58 -0500
commit9b8f85ea8138b3ec4435bcede6a1d72d27b09d73 (patch)
treec296aa4290904990160b36693af908b8fe825dcf /MediaBrowser.Api/Playback/Progressive
parenta8296cba37357a476b279bccd8d085ce123c600a (diff)
update hls subtitles
Diffstat (limited to 'MediaBrowser.Api/Playback/Progressive')
-rw-r--r--MediaBrowser.Api/Playback/Progressive/VideoService.cs3
1 files changed, 2 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/Progressive/VideoService.cs b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
index b7e180eca0..1353d8fe73 100644
--- a/MediaBrowser.Api/Playback/Progressive/VideoService.cs
+++ b/MediaBrowser.Api/Playback/Progressive/VideoService.cs
@@ -13,6 +13,7 @@ using System;
using System.Globalization;
using System.IO;
using CommonIO;
+using MediaBrowser.Model.Dlna;
namespace MediaBrowser.Api.Playback.Progressive
{
@@ -161,7 +162,7 @@ namespace MediaBrowser.Api.Playback.Progressive
args += keyFrameArg;
- var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream;
+ var hasGraphicalSubs = state.SubtitleStream != null && !state.SubtitleStream.IsTextSubtitleStream && state.VideoRequest.SubtitleMethod == SubtitleDeliveryMethod.Encode;
var hasCopyTs = false;
// Add resolution params, if specified