Merge pull request #2557 from MediaBrowser/dev

Dev

2 files changed, 12 insertions, 5 deletions

diff --git a/MediaBrowser.Model/Entities/MediaStream.cs b/MediaBrowser.Model/Entities/MediaStream.cs
index 3cd3e7dde..133b9e566 100644
--- a/MediaBrowser.Model/Entities/MediaStream.cs
+++ b/MediaBrowser.Model/Entities/MediaStream.cs
@@ -13,6 +13,11 @@ namespace MediaBrowser.Model.Entities
     [DebuggerDisplay("StreamType = {Type}")]
     public class MediaStream
     {
+        public MediaStream()
+        {
+            AllowStreamCopy = true;
+        }
+
         /// <summary>
         /// Gets or sets the codec.
         /// </summary>
@@ -153,6 +158,8 @@ namespace MediaBrowser.Model.Entities
 
         public bool? IsAVC { get; set; }
 
+        public bool AllowStreamCopy { get; set; }
+
         /// <summary>
         /// Gets or sets the channel layout.
         /// </summary>
diff --git a/MediaBrowser.Model/Net/IpAddressInfo.cs b/MediaBrowser.Model/Net/IpAddressInfo.cs
index 00a16c03d..57a0039c4 100644
--- a/MediaBrowser.Model/Net/IpAddressInfo.cs
+++ b/MediaBrowser.Model/Net/IpAddressInfo.cs
@@ -12,13 +12,13 @@ namespace MediaBrowser.Model.Net
         public string Address { get; set; }
         public IpAddressFamily AddressFamily { get; set; }
 
-        public IpAddressInfo()
-        {
-
-        }
-
         public IpAddressInfo(string address, IpAddressFamily addressFamily)
         {
+            if (string.IsNullOrWhiteSpace(address))
+            {
+                throw new ArgumentNullException("address");
+            }
+
             Address = address;
             AddressFamily = addressFamily;
         }