diff options
| author | Luke <luke.pulverenti@gmail.com> | 2017-08-11 17:56:12 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 17:56:12 -0400 |
| commit | 3237fd9e5e2a2879d0d48acc4c7e5c0f7b397c38 (patch) | |
| tree | 428594aefb259b23b2ae990a50417c75c41f4338 /Emby.Server.Implementations/LiveTv | |
| parent | aff4fc649b33b9a8ac257f11c954d8e9741a68d0 (diff) | |
| parent | b7867214ef317bbf6502e53701a990ec5f13b645 (diff) | |
Merge pull request #2806 from MediaBrowser/dev
update download error handling
Diffstat (limited to 'Emby.Server.Implementations/LiveTv')
| -rw-r--r-- | Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs index 90121b496c..48eba4117b 100644 --- a/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs +++ b/Emby.Server.Implementations/LiveTv/EmbyTV/EncodedRecorder.cs @@ -207,9 +207,12 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV inputModifier += " -fflags " + string.Join("", flags.ToArray()); } - if (!string.IsNullOrWhiteSpace(GetEncodingOptions().HardwareAccelerationType)) + var videoStream = mediaSource.VideoStream; + var videoDecoder = videoStream == null ? null : new EncodingHelper(_mediaEncoder, _fileSystem, null).GetVideoDecoder(VideoType.VideoFile, videoStream, GetEncodingOptions()); + + if (!string.IsNullOrWhiteSpace(videoDecoder)) { - inputModifier += " -hwaccel auto"; + inputModifier += " " + videoDecoder; } if (mediaSource.ReadAtNativeFramerate) |