aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThe Lynxy <the_lynxy@hotmail.com>2019-02-23 10:01:41 -0500
committerGitHub <noreply@github.com>2019-02-23 10:01:41 -0500
commit67f399dccf8f6887397d8c308ea5c0c93d2e4e06 (patch)
tree7bc412dc92657b25de2c438212a606ad68a0f987
parenteb95b025d43b1d937fccaa0b0f10cbce24fcfae1 (diff)
Leave +genpts untouched in GetProgressiveVideoArguments()
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
index 264a45d24..e378c2b89 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs
@@ -2436,8 +2436,6 @@ 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))
@@ -2449,6 +2447,11 @@ namespace MediaBrowser.Controller.MediaEncoding
{
args += " -copyts -avoid_negative_ts disabled -start_at_zero";
}
+
+ if (!state.RunTimeTicks.HasValue)
+ {
+ args += " -flags -global_header -fflags +genpts";
+ }
}
else
{