Merge pull request #971 from MediaBrowser/dev

3.0.5482.4

1 files changed, 7 insertions, 0 deletions

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
index 40ca08c40..c8d121eea 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJob.cs
@@ -18,6 +18,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
     public class EncodingJob : IDisposable
     {
         public bool HasExited { get; internal set; }
+        public bool IsCancelled { get; internal set; }
 
         public Stream LogFileStream { get; set; }
         public IProgress<double> Progress { get; set; }
@@ -399,6 +400,12 @@ namespace MediaBrowser.MediaEncoding.Encoder
 
             //    job.Framerate = framerate;
 
+            if (!percentComplete.HasValue && ticks.HasValue && RunTimeTicks.HasValue)
+            {
+                var pct = ticks.Value/RunTimeTicks.Value;
+                percentComplete = pct*100;
+            }
+
             if (percentComplete.HasValue)
             {
                 Progress.Report(percentComplete.Value);