diff options
| author | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-13 21:24:43 -0400 |
|---|---|---|
| committer | LukePulverenti <luke.pulverenti@gmail.com> | 2013-03-13 21:24:43 -0400 |
| commit | 00e0e44398c33fb55f69583e17f8f1d98218098a (patch) | |
| tree | 9bb269c3732202a47c552f1831d728a856944c3d | |
| parent | f9dd970bf873de34b6d428bef3212884d310ee9e (diff) | |
don't try to extract images if a video doesn't have any known video streams
| -rw-r--r-- | MediaBrowser.Controller/MediaInfo/FFMpegManager.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Providers/MediaInfo/FFMpegVideoImageProvider.cs | 9 |
2 files changed, 15 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs index 4c4bc0873..01746c7ce 100644 --- a/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs +++ b/MediaBrowser.Controller/MediaInfo/FFMpegManager.cs @@ -51,7 +51,7 @@ namespace MediaBrowser.Controller.MediaInfo /// The _logger /// </summary> private readonly Kernel _kernel; - + /// <summary> /// The _logger /// </summary> @@ -591,6 +591,12 @@ namespace MediaBrowser.Controller.MediaInfo throw new ArgumentNullException(); } + // Can't extract images if there are no video streams + if (video.MediaStreams == null || video.MediaStreams.All(m => m.Type != MediaStreamType.Video)) + { + return; + } + var changesMade = false; foreach (var chapter in video.Chapters) diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFMpegVideoImageProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFMpegVideoImageProvider.cs index 5a8157ebf..3d258fe66 100644 --- a/MediaBrowser.Controller/Providers/MediaInfo/FFMpegVideoImageProvider.cs +++ b/MediaBrowser.Controller/Providers/MediaInfo/FFMpegVideoImageProvider.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Common.IO; +using System.Linq; +using MediaBrowser.Common.IO; using MediaBrowser.Controller.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Entities; @@ -47,6 +48,12 @@ namespace MediaBrowser.Controller.Providers.MediaInfo if (video != null) { + // Can't extract images if there are no video streams + if (video.MediaStreams == null || video.MediaStreams.All(m => m.Type != MediaStreamType.Video)) + { + return false; + } + if (video.VideoType == VideoType.Iso && video.IsoType.HasValue && _isoManager.CanMount(item.Path)) { return true; |