Merge branch 'master' into fix/create_library_thumbs_on_first_scan

1 files changed, 10 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Dlna/EncodingContext.cs b/MediaBrowser.Model/Dlna/EncodingContext.cs
index 79ca6366d7..1408333d2e 100644
--- a/MediaBrowser.Model/Dlna/EncodingContext.cs
+++ b/MediaBrowser.Model/Dlna/EncodingContext.cs
@@ -1,10 +1,18 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Dlna
 {
+    /// <summary>
+    /// The encoding context.
+    /// </summary>
     public enum EncodingContext
     {
+        /// <summary>
+        /// The media is transcoded on the fly and delivered as a stream.
+        /// </summary>
         Streaming = 0,
+
+        /// <summary>
+        /// The media is transcoded to a static file.
+        /// </summary>
         Static = 1
     }
 }