aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-06 12:28:05 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2016-01-06 12:28:05 -0500
commitc6580287f5886609fadb9144f2e62f4eb1076a26 (patch)
tree627420816b26f391291d83a72923d35e9851da65 /MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
parentf19e3ca7a85ffb54895dfbbc33c595b06a540c76 (diff)
parentb67683e0b5fffc3cce5ddcb8d77f965b8508adb8 (diff)
Merge branch 'dev' into beta
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs')
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs3
1 files changed, 1 insertions, 2 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
index bd634ed73..ac0f2c69d 100644
--- a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -124,8 +124,7 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
{
if (extractImages)
{
- if (video.VideoType == VideoType.HdDvd || video.VideoType == VideoType.Iso ||
- video.VideoType == VideoType.BluRay)
+ if (video.VideoType == VideoType.HdDvd || video.VideoType == VideoType.Iso || video.VideoType == VideoType.BluRay)
{
continue;
}