From 9b39404b9a178e262fb50a2718b9daedb93f71f3 Mon Sep 17 00:00:00 2001
From: Lynxy <noone@nothing.null>
Date: Thu, 21 Feb 2019 19:50:57 -0500
Subject: [PATCH] Always set ffmpeg flag +genpts when video stream is being
 copied

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index f5f147db1b..264a45d24a 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -1904,7 +1904,7 @@ namespace MediaBrowser.Controller.MediaEncoding
             {
                 flags.Add("+ignidx");
             }
-            if (state.GenPtsInput)
+            if (state.GenPtsInput || string.Equals(state.OutputVideoCodec, "copy", StringComparison.OrdinalIgnoreCase))
             {
                 flags.Add("+genpts");
             }
@@ -2436,6 +2436,8 @@ namespace MediaBrowser.Controller.MediaEncoding
 
             if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase))
             {
+                args += " -flags -global_header -fflags +genpts";
+
                 if (state.VideoStream != null && IsH264(state.VideoStream) &&
                     string.Equals(state.OutputContainer, "ts", StringComparison.OrdinalIgnoreCase) &&
                     !string.Equals(state.VideoStream.NalLengthSize, "0", StringComparison.OrdinalIgnoreCase))
@@ -2447,11 +2449,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 {
                     args += " -copyts -avoid_negative_ts disabled -start_at_zero";
                 }
-
-                if (!state.RunTimeTicks.HasValue)
-                {
-                    args += " -flags -global_header -fflags +genpts";
-                }
             }
             else
             {