aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2015-12-28 22:33:10 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2015-12-28 22:33:10 -0500
commit5d4682d4185c88332c460021c0ffea26361f291b (patch)
treec50c075899778fb5e5caf6acbafe3cb95059adb8 /MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
parent2ed5c3d0e7f61534f7a01b8b200aff9115ddb444 (diff)
parent50a16452a99ee5865082c73f2a4e063cb02f6e69 (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;
}