Merge remote-tracking branch 'upstream/master' into tmdb-missing-episodes

# Conflicts:
#	Jellyfin.Server.Implementations/Item/BaseItemRepository.QueryBuilding.cs

1 files changed, 14 insertions, 2 deletions

diff --git a/MediaBrowser.Model/Dlna/CodecType.cs b/MediaBrowser.Model/Dlna/CodecType.cs
index c9f090e4cc..12730a76fa 100644
--- a/MediaBrowser.Model/Dlna/CodecType.cs
+++ b/MediaBrowser.Model/Dlna/CodecType.cs
@@ -1,11 +1,23 @@
-#pragma warning disable CS1591
-
 namespace MediaBrowser.Model.Dlna
 {
+    /// <summary>
+    /// The codec type of a codec profile.
+    /// </summary>
     public enum CodecType
     {
+        /// <summary>
+        /// The profile applies to a video codec.
+        /// </summary>
         Video = 0,
+
+        /// <summary>
+        /// The profile applies to the audio codec of a video stream.
+        /// </summary>
         VideoAudio = 1,
+
+        /// <summary>
+        /// The profile applies to an audio codec.
+        /// </summary>
         Audio = 2
     }
 }