diff options
| author | Bond-009 <bond.009@outlook.com> | 2020-02-06 13:04:07 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-06 13:04:07 +0100 |
| commit | 0a43814596cc6df1a2bb9f8e9cd1967d9cf3abbd (patch) | |
| tree | 86326b10bac7bc27b28980b4c08f43b34f54904d /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 3fe84c3213b8340f86aec0c5c488f7fc303b26cc (diff) | |
| parent | df739b5b2fc4b8f8cd9068326b01e7b8eb806c43 (diff) | |
Merge branch 'master' into sessionmanager
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs index 34af3b156..35f188bb7 100644 --- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs +++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs @@ -665,7 +665,7 @@ namespace MediaBrowser.Controller.MediaEncoding } public IProgress<double> Progress { get; set; } - public virtual void ReportTranscodingProgress(TimeSpan? transcodingPosition, float framerate, double? percentComplete, long bytesTranscoded, int? bitRate) + public virtual void ReportTranscodingProgress(TimeSpan? transcodingPosition, float? framerate, double? percentComplete, long? bytesTranscoded, int? bitRate) { Progress.Report(percentComplete.Value); } |