Merge branch 'master' into keyframe_extraction_v1

# Conflicts:
#	Jellyfin.Api/Controllers/DynamicHlsController.cs
#	MediaBrowser.Controller/MediaEncoding/IMediaEncoder.cs
#	MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs

1 files changed, 53 insertions, 0 deletions

diff --git a/MediaBrowser.Model/Entities/MetadataField.cs b/MediaBrowser.Model/Entities/MetadataField.cs
new file mode 100644
index 000000000..2cc6c8e33
--- /dev/null
+++ b/MediaBrowser.Model/Entities/MetadataField.cs
@@ -0,0 +1,53 @@
+namespace MediaBrowser.Model.Entities
+{
+    /// <summary>
+    /// Enum MetadataFields.
+    /// </summary>
+    public enum MetadataField
+    {
+        /// <summary>
+        /// The cast.
+        /// </summary>
+        Cast,
+
+        /// <summary>
+        /// The genres.
+        /// </summary>
+        Genres,
+
+        /// <summary>
+        /// The production locations.
+        /// </summary>
+        ProductionLocations,
+
+        /// <summary>
+        /// The studios.
+        /// </summary>
+        Studios,
+
+        /// <summary>
+        /// The tags.
+        /// </summary>
+        Tags,
+
+        /// <summary>
+        /// The name.
+        /// </summary>
+        Name,
+
+        /// <summary>
+        /// The overview.
+        /// </summary>
+        Overview,
+
+        /// <summary>
+        /// The runtime.
+        /// </summary>
+        Runtime,
+
+        /// <summary>
+        /// The official rating.
+        /// </summary>
+        OfficialRating
+    }
+}