aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
diff options
context:
space:
mode:
authorTavares André <tavares_and@hotmail.com>2016-02-22 18:41:38 +0100
committerTavares André <tavares_and@hotmail.com>2016-02-22 18:41:38 +0100
commit15a98c5eaa05dcd377de1778107acc0429457a2c (patch)
tree79f45e422fba7f4d8648f44529a6e4e56d2b8399 /MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
parent3eb1f47da05ce7708ee10a65b2b4f2a6de31055a (diff)
parent7f6004d1bc3b06cc20742c0eac82f4fbef1e2a53 (diff)
Merge branch 'dev' of https://github.com/MediaBrowser/Emby into dev
Diffstat (limited to 'MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs')
-rw-r--r--MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs1
1 files changed, 1 insertions, 0 deletions
diff --git a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
index bb8841222..f8f4e9ec9 100644
--- a/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
+++ b/MediaBrowser.Controller/MediaEncoding/EncodingJobOptions.cs
@@ -44,6 +44,7 @@ namespace MediaBrowser.Controller.MediaEncoding
public int? CpuCoreLimit { get; set; }
public bool ReadInputAtNativeFramerate { get; set; }
public SubtitleDeliveryMethod SubtitleMethod { get; set; }
+ public bool CopyTimestamps { get; set; }
/// <summary>
/// Gets a value indicating whether this instance has fixed resolution.