@ -227,6 +227,9 @@ namespace Emby.Drawing
imageProcessingLockTaken = true;
_imageEncoder.EncodeImage(originalImagePath, cacheFilePath, newWidth, newHeight, quality, options);
// ImageMagick doesn't seem to always release it right away
await Task.Delay(100).ConfigureAwait(false);
}
finally
@ -759,14 +759,12 @@ namespace MediaBrowser.Model.Dlna
if (profile.Method == SubtitleDeliveryMethod.External && subtitleStream.IsTextSubtitleStream == MediaStream.IsTextFormat(profile.Format))
{
if (!requiresConversion)
if (subtitleStream.IsTextSubtitleStream || !requiresConversion)
return profile;
if (subtitleStream.SupportsExternalStream)
// For sync we can handle the longer extraction times
@ -127,9 +127,12 @@ namespace MediaBrowser.Server.Implementations.Library
var supportsExternalStream = StreamSupportsExternalStream(subStream);
if (supportsExternalStream && videoBitrate >= maxAllowedBitrateForExternalSubtitleStream)
if (!subStream.IsExternal)
supportsExternalStream = false;
subStream.SupportsExternalStream = supportsExternalStream;
@ -539,11 +539,6 @@ namespace MediaBrowser.Server.Implementations.Sync
return false;
if (video.IsStacked)
if (video.IsShortcut)