better encoding

3 files changed, 13 insertions, 9 deletions

diff --git a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs
index 7232b6379..4c86e909b 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/BaseFFProbeProvider.cs
@@ -277,11 +277,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
             {
                 stream.Type = MediaStreamType.Subtitle;
             }
-            else if (streamInfo.codec_type.Equals("data", StringComparison.OrdinalIgnoreCase))
-            {
-                stream.Type = MediaStreamType.Data;
-            }
-            else
+            else if (streamInfo.codec_type.Equals("video", StringComparison.OrdinalIgnoreCase))
             {
                 stream.Type = MediaStreamType.Video;
 
@@ -293,6 +289,10 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
                 stream.AverageFrameRate = GetFrameRate(streamInfo.avg_frame_rate);
                 stream.RealFrameRate = GetFrameRate(streamInfo.r_frame_rate);
             }
+            else
+            {
+                return null;
+            }
 
             // Get stream bitrate
             if (stream.Type != MediaStreamType.Subtitle)
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs
index d55388acc..1747f3003 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeAudioInfoProvider.cs
@@ -51,7 +51,9 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
                 return;
             }
 
-            audio.MediaStreams = data.streams.Select(s => GetMediaStream(s, data.format)).ToList();
+            audio.MediaStreams = data.streams.Select(s => GetMediaStream(s, data.format))
+                .Where(i => i != null)
+                .ToList();
 
             // Get the first audio stream
             var stream = data.streams.First(s => s.codec_type.Equals("audio", StringComparison.OrdinalIgnoreCase));
@@ -146,7 +148,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
         /// </summary>
         /// <param name="val">The val.</param>
         /// <returns>System.String[][].</returns>
-        private string[] Split(string  val)
+        private string[] Split(string val)
         {
             // Only use the comma as a delimeter if there are no slashes or pipes. 
             // We want to be careful not to split names that have commas in them
@@ -168,7 +170,7 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
             if (!string.IsNullOrEmpty(val))
             {
                 var studios =
-                    val.Split(new[] {'/', '|'}, StringSplitOptions.RemoveEmptyEntries)
+                    val.Split(new[] { '/', '|' }, StringSplitOptions.RemoveEmptyEntries)
                        .Where(i => !string.Equals(i, audio.Artist, StringComparison.OrdinalIgnoreCase) && !string.Equals(i, audio.AlbumArtist, StringComparison.OrdinalIgnoreCase));
 
                 audio.Studios.Clear();
diff --git a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs
index 0fb3c853a..93533b4f0 100644
--- a/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs
+++ b/MediaBrowser.Controller/Providers/MediaInfo/FFProbeVideoInfoProvider.cs
@@ -213,7 +213,9 @@ namespace MediaBrowser.Controller.Providers.MediaInfo
 
             if (data.streams != null)
             {
-                video.MediaStreams = data.streams.Select(s => GetMediaStream(s, data.format)).ToList();
+                video.MediaStreams = data.streams.Select(s => GetMediaStream(s, data.format))
+                .Where(i => i != null)
+                .ToList();
             }
 
             if (data.Chapters != null)