Merge branch 'dev' into code-cleanup

2019-01-11 12:50:36 +01:00
parent ec1f5dc317 e5c2dbdf23
commit e2751d42e8
345 changed files with 2991 additions and 3236 deletions
@@ -207,13 +207,13 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV

            var outputParam = string.Empty;

-            var commandLineArgs = string.Format("-i \"{0}\"{5} {2} -map_metadata -1 -threads 0 {3}{4}{6} -y \"{1}\"", 
-                inputTempFile, 
-                targetFile, 
-                videoArgs, 
-                GetAudioArgs(mediaSource), 
-                subtitleArgs, 
-                durationParam, 
+            var commandLineArgs = string.Format("-i \"{0}\"{5} {2} -map_metadata -1 -threads 0 {3}{4}{6} -y \"{1}\"",
+                inputTempFile,
+                targetFile,
+                videoArgs,
+                GetAudioArgs(mediaSource),
+                subtitleArgs,
+                durationParam,
                outputParam);

            return inputModifier + " " + commandLineArgs;