Murzaby/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-08-27 04:08:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Merge branch 'master' into images

Browse source
This commit is contained in:
Bond-009 2020-02-12 17:41:46 +01:00 • committed by GitHub
commit a2490a7ae5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
575 changed files with 2886 additions and 2178 deletions
Download patch file Download diff file Expand all files Collapse all files

2
MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
View file

@ -657,7 +657,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);
}