aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Api
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2017-07-03 13:16:01 -0400
committerLuke Pulverenti <luke.pulverenti@gmail.com>2017-07-03 13:16:01 -0400
commit6ea8e7868df95cea54216a5dbf927b3b4069bde5 (patch)
treec9e920a547ea696b7dce06cf21cf3398a653bde4 /MediaBrowser.Api
parentc4a271534e603224ece366dcfa976012d5750fbe (diff)
add live stream params
Diffstat (limited to 'MediaBrowser.Api')
-rw-r--r--MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs5
-rw-r--r--MediaBrowser.Api/Playback/MediaInfoService.cs2
2 files changed, 6 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
index c6282bbad5..664735dfe4 100644
--- a/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
+++ b/MediaBrowser.Api/Playback/Hls/DynamicHlsService.cs
@@ -848,6 +848,11 @@ namespace MediaBrowser.Api.Playback.Hls
{
return string.Empty;
}
+ // No known video stream
+ if (state.VideoStream == null)
+ {
+ return string.Empty;
+ }
var codec = EncodingHelper.GetVideoEncoder(state, ApiEntryPoint.Instance.GetEncodingOptions());
diff --git a/MediaBrowser.Api/Playback/MediaInfoService.cs b/MediaBrowser.Api/Playback/MediaInfoService.cs
index ae7271844d..536236f5fe 100644
--- a/MediaBrowser.Api/Playback/MediaInfoService.cs
+++ b/MediaBrowser.Api/Playback/MediaInfoService.cs
@@ -199,7 +199,7 @@ namespace MediaBrowser.Api.Playback
SubtitleStreamIndex = request.SubtitleStreamIndex,
UserId = request.UserId,
OpenToken = mediaSource.OpenToken,
- AllowMediaProbe = request.AllowMediaProbe
+ EnableMediaProbe = request.EnableMediaProbe
}).ConfigureAwait(false);