diff --git a/BasicNodes/BasicNodes.csproj b/BasicNodes/BasicNodes.csproj index caca0dbe..d38d0dfa 100644 Binary files a/BasicNodes/BasicNodes.csproj and b/BasicNodes/BasicNodes.csproj differ diff --git a/Builds/BasicNodes.zip b/Builds/BasicNodes.zip index 3666644a..7a367cfc 100644 Binary files a/Builds/BasicNodes.zip and b/Builds/BasicNodes.zip differ diff --git a/Builds/MetaNodes.zip b/Builds/MetaNodes.zip index e71ee5d3..3f3ed985 100644 Binary files a/Builds/MetaNodes.zip and b/Builds/MetaNodes.zip differ diff --git a/Builds/VideoNodes.zip b/Builds/VideoNodes.zip index b03ccd2c..ac2beb4c 100644 Binary files a/Builds/VideoNodes.zip and b/Builds/VideoNodes.zip differ diff --git a/MetaNodes/MetaNodes.csproj b/MetaNodes/MetaNodes.csproj index 2af5c0bc..67d6f1ec 100644 Binary files a/MetaNodes/MetaNodes.csproj and b/MetaNodes/MetaNodes.csproj differ diff --git a/VideoNodes/VideoNodes.csproj b/VideoNodes/VideoNodes.csproj index 401201f5..d7ff6274 100644 Binary files a/VideoNodes/VideoNodes.csproj and b/VideoNodes/VideoNodes.csproj differ diff --git a/VideoNodes/VideoNodes/VideoEncode.cs b/VideoNodes/VideoNodes/VideoEncode.cs index 74bc5273..778917c9 100644 --- a/VideoNodes/VideoNodes/VideoEncode.cs +++ b/VideoNodes/VideoNodes/VideoEncode.cs @@ -92,9 +92,6 @@ namespace FileFlows.VideoNodes bool audioRightCodec = bestAudio?.Codec?.ToLower() == AudioCodec && videoInfo.AudioStreams[0] == bestAudio; args.Logger?.ILog("Best Audio: ", bestAudio == null ? "null" : (object)bestAudio); - bool sameContainer = new FileInfo(args.WorkingFile).Extension.ToLower() == Extension.ToLower(); - - string crop = args.GetParameter(DetectBlackBars.CROP_KEY) ?? ""; if (crop != string.Empty) crop = " -vf crop=" + crop; @@ -125,7 +122,7 @@ namespace FileFlows.VideoNodes TotalTime = videoInfo.VideoStreams[0].Duration; - if (audioRightCodec == false || sameContainer == false) // if container changes, re-encode audio, otherwise this can lead to failed encodings (mp4 to mkv this can happen... a lot) + if (audioRightCodec == false) ffArgs.Add($"-map 0:{bestAudio!.Index} -c:a {AudioCodec}"); else ffArgs.Add($"-map 0:{bestAudio!.Index} -c:a copy"); diff --git a/plugins.json b/plugins.json index 858cb8fc..6a930f19 100644 --- a/plugins.json +++ b/plugins.json @@ -1,17 +1,17 @@ [ { "Name": "BasicNodes", - "Version": "0.0.1.27", + "Version": "0.0.1.28", "Package": "https://github.com/revenz/FileFlowsPlugins/blob/master/Builds/BasicNodes.zip?raw=true" }, { "Name": "MetaNodes", - "Version": "0.0.1.27", + "Version": "0.0.1.28", "Package": "https://github.com/revenz/FileFlowsPlugins/blob/master/Builds/MetaNodes.zip?raw=true" }, { "Name": "VideoNodes", - "Version": "0.0.1.27", + "Version": "0.0.1.28", "Package": "https://github.com/revenz/FileFlowsPlugins/blob/master/Builds/VideoNodes.zip?raw=true" } ]