From 57aec873d08159d0e5ffb43ecf1e0a05f43038be Mon Sep 17 00:00:00 2001
From: Waldemar Tomme <waldetomme@gmail.com>
Date: Sun, 22 Dec 2019 13:01:18 +0100
Subject: Add check if output container supports "global_header" flag

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

(limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 020f0553e..424dd0dbe 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2750,6 +2750,8 @@ namespace MediaBrowser.Controller.MediaEncoding
                 args += " -mpegts_m2ts_mode 1";
             }
 
+            var supportsGlobalHeaderFlag = state.OutputContainer != "mkv";
+
             if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase))
             {
                 if (state.VideoStream != null
@@ -2770,7 +2772,12 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 if (!state.RunTimeTicks.HasValue)
                 {
-                    args += " -flags -global_header -fflags +genpts";
+                    if(supportsGlobalHeaderFlag)
+                    {
+                        args += " -flags -global_header";
+                    }
+
+                    args += " -fflags +genpts";
                 }
             }
             else
@@ -2816,7 +2823,7 @@ namespace MediaBrowser.Controller.MediaEncoding
                     args += " " + qualityParam.Trim();
                 }
 
-                if (!state.RunTimeTicks.HasValue)
+                if (supportsGlobalHeaderFlag && !state.RunTimeTicks.HasValue)
                 {
                     args += " -flags -global_header";
                 }
-- 
cgit v1.2.3


From ef487441d1545a21ff4e11d40c37a9ecf200f2e5 Mon Sep 17 00:00:00 2001
From: Waldemar Tomme <waldetomme@gmail.com>
Date: Tue, 21 Jan 2020 06:48:25 +0100
Subject: Remove configuration of global_header flag

---
 MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 12 ------------
 1 file changed, 12 deletions(-)

(limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')

diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 424dd0dbe..702245946 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2750,8 +2750,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 args += " -mpegts_m2ts_mode 1";
             }
 
-            var supportsGlobalHeaderFlag = state.OutputContainer != "mkv";
-
             if (string.Equals(videoCodec, "copy", StringComparison.OrdinalIgnoreCase))
             {
                 if (state.VideoStream != null
@@ -2772,11 +2770,6 @@ namespace MediaBrowser.Controller.MediaEncoding
 
                 if (!state.RunTimeTicks.HasValue)
                 {
-                    if(supportsGlobalHeaderFlag)
-                    {
-                        args += " -flags -global_header";
-                    }
-
                     args += " -fflags +genpts";
                 }
             }
@@ -2822,11 +2815,6 @@ namespace MediaBrowser.Controller.MediaEncoding
                 {
                     args += " " + qualityParam.Trim();
                 }
-
-                if (supportsGlobalHeaderFlag && !state.RunTimeTicks.HasValue)
-                {
-                    args += " -flags -global_header";
-                }
             }
 
             if (!string.IsNullOrEmpty(state.OutputVideoSync))
-- 
cgit v1.2.3