Merge pull request #977 from Lynxy/genpts

Always set ffmpeg flag +genpts when video stream is being copied
6 years ago · 9651a78b0c
parent 9eba31185a 67f399dccf
commit 9651a78b0c
2 changed files with 2 additions and 1 deletions
--- 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

--- 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");
            }