diff options
| author | Luke <luke.pulverenti@gmail.com> | 2016-10-28 15:57:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-28 15:57:49 -0400 |
| commit | 6367da37a6375a13536704c42642a2dac7be9bc8 (patch) | |
| tree | d969c40cff45ae90e76392526a43f16b661eab09 /MediaBrowser.Server.Implementations/LiveTv | |
| parent | 791d0f75b95ad9e2800f1b0f43fb33d052b18479 (diff) | |
| parent | 9c6da95d6a5dce333fb66a58d73f7655f3a4d6ce (diff) | |
Merge pull request #2257 from MediaBrowser/dev
Dev
Diffstat (limited to 'MediaBrowser.Server.Implementations/LiveTv')
| -rw-r--r-- | MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs index 89e989765..95c2b5ebb 100644 --- a/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs +++ b/MediaBrowser.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs @@ -53,7 +53,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV { var format = _liveTvOptions.RecordingEncodingFormat; - if (string.Equals(format, "mkv", StringComparison.OrdinalIgnoreCase) || _liveTvOptions.EnableOriginalVideoWithEncodedRecordings) + if (string.Equals(format, "mkv", StringComparison.OrdinalIgnoreCase) || string.Equals(_liveTvOptions.RecordedVideoCodec, "copy", StringComparison.OrdinalIgnoreCase)) { return "mkv"; } @@ -205,7 +205,7 @@ namespace MediaBrowser.Server.Implementations.LiveTv.EmbyTV private bool EncodeVideo(MediaSourceInfo mediaSource) { - if (_liveTvOptions.EnableOriginalAudioWithEncodedRecordings) + if (string.Equals(_liveTvOptions.RecordedVideoCodec, "copy", StringComparison.OrdinalIgnoreCase)) { return false; } |
