Merge remote-tracking branch 'upstream/master' into 3.1.7

1 files changed, 8 insertions, 6 deletions

diff --git a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
index 7c2d9f1fd..63310fdf6 100644
--- a/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
+++ b/MediaBrowser.MediaEncoding/Encoder/EncodingUtils.cs
@@ -1,6 +1,8 @@
 #pragma warning disable CS1591
 
+using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using MediaBrowser.Model.MediaInfo;
 
@@ -14,7 +16,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             {
                 var url = inputFiles[0];
 
-                return string.Format("\"{0}\"", url);
+                return string.Format(CultureInfo.InvariantCulture, "\"{0}\"", url);
             }
 
             return GetConcatInputArgument(inputFiles);
@@ -33,7 +35,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
             {
                 var files = string.Join("|", inputFiles.Select(NormalizePath));
 
-                return string.Format("concat:\"{0}\"", files);
+                return string.Format(CultureInfo.InvariantCulture, "concat:\"{0}\"", files);
             }
 
             // Determine the input path for video files
@@ -47,15 +49,15 @@ namespace MediaBrowser.MediaEncoding.Encoder
         /// <returns>System.String.</returns>
         private static string GetFileInputArgument(string path)
         {
-            if (path.IndexOf("://") != -1)
+            if (path.IndexOf("://", StringComparison.Ordinal) != -1)
             {
-                return string.Format("\"{0}\"", path);
+                return string.Format(CultureInfo.InvariantCulture, "\"{0}\"", path);
             }
 
             // Quotes are valid path characters in linux and they need to be escaped here with a leading \
             path = NormalizePath(path);
 
-            return string.Format("file:\"{0}\"", path);
+            return string.Format(CultureInfo.InvariantCulture, "file:\"{0}\"", path);
         }
 
         /// <summary>
@@ -66,7 +68,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
         private static string NormalizePath(string path)
         {
             // Quotes are valid path characters in linux and they need to be escaped here with a leading \
-            return path.Replace("\"", "\\\"");
+            return path.Replace("\"", "\\\"", StringComparison.Ordinal);
         }
     }
 }