Merge pull request #1 from MediaBrowser/master

update

2 files changed, 3 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Entities/DisplayPreferences.cs b/MediaBrowser.Model/Entities/DisplayPreferences.cs
index 56a2c61944..cac703c910 100644
--- a/MediaBrowser.Model/Entities/DisplayPreferences.cs
+++ b/MediaBrowser.Model/Entities/DisplayPreferences.cs
@@ -2,13 +2,14 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
+using MediaBrowser.Model.Extensions;
 
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
     /// Defines the display preferences for any item that supports them (usually Folders)
     /// </summary>
-    public class DisplayPreferences : INotifyPropertyChanged
+    public class DisplayPreferences : IHasPropertyChangedEvent
     {
         /// <summary>
         /// Occurs when [property changed].
diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 7be8a64b74..fe05483e77 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -136,7 +136,7 @@ namespace MediaBrowser.Model.Entities
             {
                 if (Type != MediaStreamType.Subtitle) return false;
 
-                var codec = Codec ?? string.Empty;
+                string codec = Codec ?? string.Empty;
 
                 return StringHelper.IndexOfIgnoreCase(codec, "pgs") == -1 &&
                        StringHelper.IndexOfIgnoreCase(codec, "dvd") == -1;