Merge pull request #2636 from MediaBrowser/dev

Dev

1 files changed, 7 insertions, 5 deletions

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
index 409dec482..9b89e8f5a 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobInfo.cs
@@ -59,7 +59,7 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             get
             {
-                return false;
+                return MediaSource.GenPtsInput;
             }
         }
 
@@ -93,11 +93,13 @@ namespace MediaBrowser.Controller.MediaEncoding
         {
             get
             {
-                // For live tv + recordings
-                if (string.Equals(InputContainer, "mpegts", StringComparison.OrdinalIgnoreCase) ||
-                    string.Equals(InputContainer, "ts", StringComparison.OrdinalIgnoreCase))
+                // For live tv + in progress recordings
+                if (string.Equals(InputContainer, "mpegts", StringComparison.OrdinalIgnoreCase) || string.Equals(InputContainer, "ts", StringComparison.OrdinalIgnoreCase))
                 {
-                    return "cfr";
+                    if (!MediaSource.RunTimeTicks.HasValue)
+                    {
+                        return "cfr";
+                    }
                 }
 
                 return "-1";