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, 8 insertions, 8 deletions

diff --git a/MediaBrowser.Model/Session/HardwareEncodingType.cs b/MediaBrowser.Model/Session/HardwareEncodingType.cs
index 0e172f35f..0db5697d3 100644
--- a/MediaBrowser.Model/Session/HardwareEncodingType.cs
+++ b/MediaBrowser.Model/Session/HardwareEncodingType.cs
@@ -6,42 +6,42 @@
     public enum HardwareEncodingType
     {
         /// <summary>
-        /// AMD AMF
+        /// AMD AMF.
         /// </summary>
         AMF = 0,
 
         /// <summary>
-        /// Intel Quick Sync Video
+        /// Intel Quick Sync Video.
         /// </summary>
         QSV = 1,
 
         /// <summary>
-        /// NVIDIA NVENC
+        /// NVIDIA NVENC.
         /// </summary>
         NVENC = 2,
 
         /// <summary>
-        /// OpenMax OMX
+        /// OpenMax OMX.
         /// </summary>
         OMX = 3,
 
         /// <summary>
-        /// Exynos V4L2 MFC
+        /// Exynos V4L2 MFC.
         /// </summary>
         V4L2M2M = 4,
 
         /// <summary>
-        /// MediaCodec Android
+        /// MediaCodec Android.
         /// </summary>
         MediaCodec = 5,
 
         /// <summary>
-        /// Video Acceleration API (VAAPI)
+        /// Video Acceleration API (VAAPI).
         /// </summary>
         VAAPI = 6,
 
         /// <summary>
-        /// Video ToolBox
+        /// Video ToolBox.
         /// </summary>
         VideoToolBox = 7
     }