diff options
| author | Claus Vium <clausvium@gmail.com> | 2019-03-07 20:16:51 +0100 |
|---|---|---|
| committer | Claus Vium <clausvium@gmail.com> | 2019-03-07 20:16:51 +0100 |
| commit | 0abe57e930e44eab9566991f33b089d1e61cfb83 (patch) | |
| tree | 602be322daedca127ba66de07837ac8e792730a7 /MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | |
| parent | dfff68b2f4ca8d3da59508eb4cbe2e751ed76f49 (diff) | |
| parent | ae0ecc1b10982d9240ecdcc82cb7299fc708aafb (diff) | |
Merge remote-tracking branch 'remotes/upstream/master' into kestrel_poc
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs')
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs b/MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs index f5f147db1..e378c2b89 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"); } |