diff options
| author | Tavares André <tavares_and@hotmail.com> | 2016-02-22 18:41:38 +0100 |
|---|---|---|
| committer | Tavares André <tavares_and@hotmail.com> | 2016-02-22 18:41:38 +0100 |
| commit | 15a98c5eaa05dcd377de1778107acc0429457a2c (patch) | |
| tree | 79f45e422fba7f4d8648f44529a6e4e56d2b8399 /MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | |
| parent | 3eb1f47da05ce7708ee10a65b2b4f2a6de31055a (diff) | |
| parent | 7f6004d1bc3b06cc20742c0eac82f4fbef1e2a53 (diff) | |
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
Diffstat (limited to 'MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs')
| -rw-r--r-- | MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs index 252386af0..c64b574a9 100644 --- a/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs +++ b/MediaBrowser.MediaEncoding/Encoder/EncodingJobFactory.cs @@ -794,6 +794,8 @@ namespace MediaBrowser.MediaEncoding.Encoder state.EstimateContentLength = transcodingProfile.EstimateContentLength; state.EnableMpegtsM2TsMode = transcodingProfile.EnableMpegtsM2TsMode; state.TranscodeSeekInfo = transcodingProfile.TranscodeSeekInfo; + + state.Options.CopyTimestamps = transcodingProfile.CopyTimestamps; } } } |