diff options
| author | Claus Vium <cvium@users.noreply.github.com> | 2020-02-03 13:51:34 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-03 13:51:34 +0100 |
| commit | 241e351a6128aeaf594e8fefe2da244970c24954 (patch) | |
| tree | 6f8957265ebb56eee8a4bbdf81df624cd3a6302d /MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs | |
| parent | d69870680b9a12118b2e5b5e9944c91b886a12c9 (diff) | |
| parent | b7a9900556d2fb316f0ea9d96e561bebb5332257 (diff) | |
Merge branch 'master' into dlnawarnings
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); } |