diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-10 14:56:12 -0400 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2013-09-10 14:56:12 -0400 |
| commit | 3c2ec758bedcffe2e389bffde5b4e153e4cb8a86 (patch) | |
| tree | 89e1711a8de9224fb44a7806d8dd4f43b79a13cf | |
| parent | 740a10a4e3f85ffcfd26ec18263d4c78d4b14ecc (diff) | |
fix streaming trailers over HLS
| -rw-r--r-- | MediaBrowser.Api/Playback/Hls/VideoHlsService.cs | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs index 534727267..2066849ae 100644 --- a/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs +++ b/MediaBrowser.Api/Playback/Hls/VideoHlsService.cs @@ -206,13 +206,16 @@ namespace MediaBrowser.Api.Playback.Hls var framerate = state.VideoRequest.Framerate ?? 0; // We have to supply a framerate for hls, so if it's null, account for that here - if (framerate.Equals(0)) - { - framerate = state.VideoStream.AverageFrameRate ?? 0; - } - if (framerate.Equals(0)) + if (state.VideoStream != null) { - framerate = state.VideoStream.RealFrameRate ?? 0; + if (framerate.Equals(0)) + { + framerate = state.VideoStream.AverageFrameRate ?? 0; + } + if (framerate.Equals(0)) + { + framerate = state.VideoStream.RealFrameRate ?? 0; + } } if (framerate.Equals(0)) { |