aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model/Configuration/EncodingOptions.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-08-13 01:01:57 -0400
committerGitHub <noreply@github.com>2017-08-13 01:01:57 -0400
commit2c4e8c479fe08931e2dbe908db0022f600f9e885 (patch)
treef8a3a2755a4e36cf6ee23430153f61b5e2734a88 /MediaBrowser.Model/Configuration/EncodingOptions.cs
parent738c8eeac49263098d474881d36a8c689db193b0 (diff)
parent4ea39256261f0ff537e0a75853e5881596602f50 (diff)
Merge pull request #2809 from MediaBrowser/dev
auto fallback from gpu to cpu
Diffstat (limited to 'MediaBrowser.Model/Configuration/EncodingOptions.cs')
-rw-r--r--MediaBrowser.Model/Configuration/EncodingOptions.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/MediaBrowser.Model/Configuration/EncodingOptions.cs b/MediaBrowser.Model/Configuration/EncodingOptions.cs
index 55d05418c..d619e3140 100644
--- a/MediaBrowser.Model/Configuration/EncodingOptions.cs
+++ b/MediaBrowser.Model/Configuration/EncodingOptions.cs
@@ -27,7 +27,7 @@ namespace MediaBrowser.Model.Configuration
H264Crf = 23;
EnableHardwareEncoding = true;
- HardwareDecodingCodecs = new string[] { "h264", "mpeg2video", "vc1" };
+ HardwareDecodingCodecs = new string[] { "h264", "vc1" };
}
}
}