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, 0 insertions, 18 deletions

diff --git a/MediaBrowser.Common/Cryptography/Constants.cs b/MediaBrowser.Common/Cryptography/Constants.cs
deleted file mode 100644
index 354114232..000000000
--- a/MediaBrowser.Common/Cryptography/Constants.cs
+++ /dev/null
@@ -1,18 +0,0 @@
-namespace MediaBrowser.Common.Cryptography
-{
-    /// <summary>
-    /// Class containing global constants for Jellyfin Cryptography.
-    /// </summary>
-    public static class Constants
-    {
-        /// <summary>
-        /// The default length for new salts.
-        /// </summary>
-        public const int DefaultSaltLength = 64;
-
-        /// <summary>
-        /// The default amount of iterations for hashing passwords.
-        /// </summary>
-        public const int DefaultIterations = 1000;
-    }
-}