Merge pull request #8 from jellyfin/master

rebase to latest master

1 files changed, 7 insertions, 8 deletions

diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 35369fbbb..e0c3bead1 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -1,10 +1,9 @@
-using System;
-using System.Linq;
+using System;
 using System.Collections.Generic;
+using System.Globalization;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Extensions;
 using MediaBrowser.Model.MediaInfo;
-using System.Globalization;
 
 namespace MediaBrowser.Model.Entities
 {
@@ -77,7 +76,7 @@ namespace MediaBrowser.Model.Entities
                     //    return AddLanguageIfNeeded(Title);
                     //}
 
-                    List<string> attributes = new List<string>();
+                    var attributes = new List<string>();
 
                     if (!string.IsNullOrEmpty(Language))
                     {
@@ -110,7 +109,7 @@ namespace MediaBrowser.Model.Entities
 
                 if (Type == MediaStreamType.Video)
                 {
-                    List<string> attributes = new List<string>();
+                    var attributes = new List<string>();
 
                     var resolutionText = GetResolutionText();
 
@@ -134,7 +133,7 @@ namespace MediaBrowser.Model.Entities
                     //    return AddLanguageIfNeeded(Title);
                     //}
 
-                    List<string> attributes = new List<string>();
+                    var attributes = new List<string>();
 
                     if (!string.IsNullOrEmpty(Language))
                     {
@@ -420,7 +419,7 @@ namespace MediaBrowser.Model.Entities
 
             var fromCodec = Codec;
 
-            // Can't convert from this 
+            // Can't convert from this
             if (StringHelper.EqualsIgnoreCase(fromCodec, "ass"))
             {
                 return false;
@@ -430,7 +429,7 @@ namespace MediaBrowser.Model.Entities
                 return false;
             }
 
-            // Can't convert to this 
+            // Can't convert to this
             if (StringHelper.EqualsIgnoreCase(toCodec, "ass"))
             {
                 return false;