diff options
| author | Anthony Lavado <anthony@lavado.ca> | 2020-02-12 02:01:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 02:01:56 -0500 |
| commit | 42066ee326277fb181f609a8530cf419569efbf8 (patch) | |
| tree | 4c119429d3689c03ed267880a4257cb6402c45ae /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | 081d942d0361a4ad8aa918edcbb2f20c4c3f8471 (diff) | |
| parent | 684568e6d2ef163c91fa5faf26600c16acf4b0b8 (diff) | |
Merge branch 'master' into transcoding-throttling
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); } |