aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Rabert <6550543+nvllsvm@users.noreply.github.com>2019-01-21 20:05:43 -0500
committerGitHub <noreply@github.com>2019-01-21 20:05:43 -0500
commit9ad182502fe0f7eb1691080c7592e3fe1d97a3de (patch)
treecac92d7a1f23d29703722161c34c6c2736fb07da
parente6b95db132a6ffc943929cbf11f2a580e8ce3609 (diff)
parent73df5bdbe9cbbe0231347b200b71886f50206e7a (diff)
Merge pull request #661 from Bond-009/streamstate
Fix NullRef from progress report
-rw-r--r--MediaBrowser.Api/Playback/StreamState.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Api/Playback/StreamState.cs b/MediaBrowser.Api/Playback/StreamState.cs
index 96dc4ab4c..8d4b0cb3d 100644
--- a/MediaBrowser.Api/Playback/StreamState.cs
+++ b/MediaBrowser.Api/Playback/StreamState.cs
@@ -167,7 +167,7 @@ namespace MediaBrowser.Api.Playback
public DeviceProfile DeviceProfile { get; set; }
public TranscodingJob TranscodingJob;
- public void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded, int? bitRate)
+ public override void ReportTranscodingProgress(TimeSpan? transcodingPosition, float framerate, double? percentComplete, long bytesTranscoded, int? bitRate)
{
ApiEntryPoint.Instance.ReportTranscodingProgress(TranscodingJob, this, transcodingPosition, framerate, percentComplete, bytesTranscoded, bitRate);
}