diff options
| author | Joshua M. Boniface <joshua@boniface.me> | 2019-02-27 00:52:51 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-27 00:52:51 -0500 |
| commit | 9651a78b0c42958f01b01aee78e661125ad1970d (patch) | |
| tree | ba3a4b17cb5596f522f238650a668486f129842b | |
| parent | 9eba31185aa68be1ace220b8036ff952af2d1b4c (diff) | |
| parent | 67f399dccf8f6887397d8c308ea5c0c93d2e4e06 (diff) | |
Merge pull request #977 from Lynxy/genpts
Always set ffmpeg flag +genpts when video stream is being copied
| -rw-r--r-- | CONTRIBUTORS.md | 1 | ||||
| -rw-r--r-- | MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 758202af6..0831e1340 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -21,6 +21,7 @@ - [WillWill56](https://github.com/WillWill56) - [Liggy](https://github.com/Liggy) - [fruhnow](https://github.com/fruhnow) + - [Lynxy](https://github.com/Lynxy) # Emby Contributors 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"); } |