aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/MediaEncoder
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Server.Implementations/MediaEncoder')
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs5
-rw-r--r--MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs4
2 files changed, 6 insertions, 3 deletions
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
index 6f4b7a8a7..f74865d2c 100644
--- a/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/EncodingManager.cs
@@ -84,6 +84,11 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
/// <returns><c>true</c> if [is eligible for chapter image extraction] [the specified video]; otherwise, <c>false</c>.</returns>
private bool IsEligibleForChapterImageExtraction(Video video)
{
+ if (video.IsPlaceHolder)
+ {
+ return false;
+ }
+
if (video is Movie)
{
if (!_config.Configuration.EnableMovieChapterImageExtraction)
diff --git a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
index e71867b05..25b9c687c 100644
--- a/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
+++ b/MediaBrowser.Server.Implementations/MediaEncoder/MediaEncoder.cs
@@ -125,13 +125,11 @@ namespace MediaBrowser.Server.Implementations.MediaEncoder
switch (type)
{
+ case InputType.Bluray:
case InputType.Dvd:
case InputType.File:
inputPath = GetConcatInputArgument(inputFiles);
break;
- case InputType.Bluray:
- inputPath = GetBlurayInputArgument(inputFiles[0]);
- break;
case InputType.Url:
inputPath = GetHttpInputArgument(inputFiles);
break;