Merge pull request #2844 from MediaBrowser/dev
fix video images not being created
This commit is contained in:
commit
7434dae5d2
|
@ -75,6 +75,11 @@ namespace Emby.Server.Implementations.MediaEncoder
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!video.IsCompleteMedia)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// Can't extract images if there are no video streams
|
// Can't extract images if there are no video streams
|
||||||
return video.DefaultVideoStreamIndex.HasValue;
|
return video.DefaultVideoStreamIndex.HasValue;
|
||||||
}
|
}
|
||||||
|
|
|
@ -161,7 +161,10 @@ namespace MediaBrowser.Controller.Entities
|
||||||
{
|
{
|
||||||
videoType = VideoType.Dvd;
|
videoType = VideoType.Dvd;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return new string[] { };
|
||||||
|
}
|
||||||
return MediaEncoder.GetPlayableStreamFileNames(Path, videoType);
|
return MediaEncoder.GetPlayableStreamFileNames(Path, videoType);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -265,6 +268,12 @@ namespace MediaBrowser.Controller.Entities
|
||||||
return base.CanDelete();
|
return base.CanDelete();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[IgnoreDataMember]
|
||||||
|
public bool IsCompleteMedia
|
||||||
|
{
|
||||||
|
get { return !IsActiveRecording(); }
|
||||||
|
}
|
||||||
|
|
||||||
[IgnoreDataMember]
|
[IgnoreDataMember]
|
||||||
protected virtual bool EnableDefaultVideoUserDataKeys
|
protected virtual bool EnableDefaultVideoUserDataKeys
|
||||||
{
|
{
|
||||||
|
|
|
@ -39,6 +39,11 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||||
return new List<string>();
|
return new List<string>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!video.IsCompleteMedia)
|
||||||
|
{
|
||||||
|
return new List<string>();
|
||||||
|
}
|
||||||
|
|
||||||
VideoContentType mediaType;
|
VideoContentType mediaType;
|
||||||
|
|
||||||
if (video is Episode)
|
if (video is Episode)
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("3.2.28.6")]
|
[assembly: AssemblyVersion("3.2.28.7")]
|
||||||
|
|
Loading…
Reference in New Issue
Block a user