From 5fa6422ea203458233e11559b6784c0194f1ace1 Mon Sep 17 00:00:00 2001 From: Philip Butkiewicz Date: Tue, 3 Sep 2024 22:54:02 +0200 Subject: [PATCH] Fix for DJI drone footage not exporting due to stream mapping issues + LibVLCSharp bump --- MediaHelper.plugin/Properties/AssemblyInfo.cs | 4 ++-- SharpCut/Properties/AssemblyInfo.cs | 4 ++-- SharpCut/Resources/BuildDate.txt | 2 +- SharpCut/SharpCut.csproj | 8 ++++---- SharpCut/packages.config | 4 ++-- SharpCutCommon/Dialogs/ProgressDialog.cs | 5 ----- SharpCutCommon/Properties/AssemblyInfo.cs | 4 ++-- SharpCutCommon/SharpCutCommon.csproj | 8 ++++---- SharpCutCommon/Video/FFMPEG.cs | 2 -- SharpCutCommon/packages.config | 4 ++-- 10 files changed, 19 insertions(+), 26 deletions(-) diff --git a/MediaHelper.plugin/Properties/AssemblyInfo.cs b/MediaHelper.plugin/Properties/AssemblyInfo.cs index 97ac061..edce729 100644 --- a/MediaHelper.plugin/Properties/AssemblyInfo.cs +++ b/MediaHelper.plugin/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.7.0")] -[assembly: AssemblyFileVersion("1.4.7.0")] +[assembly: AssemblyVersion("1.4.8.0")] +[assembly: AssemblyFileVersion("1.4.8.0")] diff --git a/SharpCut/Properties/AssemblyInfo.cs b/SharpCut/Properties/AssemblyInfo.cs index fd3a9ad..aac9028 100644 --- a/SharpCut/Properties/AssemblyInfo.cs +++ b/SharpCut/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.7.0")] -[assembly: AssemblyFileVersion("1.4.7.0")] +[assembly: AssemblyVersion("1.4.8.0")] +[assembly: AssemblyFileVersion("1.4.8.0")] diff --git a/SharpCut/Resources/BuildDate.txt b/SharpCut/Resources/BuildDate.txt index ed55039..d23e524 100644 --- a/SharpCut/Resources/BuildDate.txt +++ b/SharpCut/Resources/BuildDate.txt @@ -1 +1 @@ -Sun 05/12/2024 11:56:54.54 +Tue 09/03/2024 22:50:26.42 diff --git a/SharpCut/SharpCut.csproj b/SharpCut/SharpCut.csproj index ec2e273..f074c13 100644 --- a/SharpCut/SharpCut.csproj +++ b/SharpCut/SharpCut.csproj @@ -60,11 +60,11 @@ SharpCut.ico - - ..\packages\LibVLCSharp.3.8.2\lib\net471\LibVLCSharp.dll + + ..\packages\LibVLCSharp.3.9.0\lib\net471\LibVLCSharp.dll - - ..\packages\LibVLCSharp.WinForms.3.8.2\lib\net40\LibVLCSharp.WinForms.dll + + ..\packages\LibVLCSharp.WinForms.3.9.0\lib\net40\LibVLCSharp.WinForms.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/SharpCut/packages.config b/SharpCut/packages.config index 8591182..dfe3332 100644 --- a/SharpCut/packages.config +++ b/SharpCut/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/SharpCutCommon/Dialogs/ProgressDialog.cs b/SharpCutCommon/Dialogs/ProgressDialog.cs index 85f1c01..2a84939 100644 --- a/SharpCutCommon/Dialogs/ProgressDialog.cs +++ b/SharpCutCommon/Dialogs/ProgressDialog.cs @@ -20,11 +20,6 @@ public ProgressDialog() InitializeComponent(); } - public void ShowError(string error) - { - - } - public void SetProgress(int progress, TimeSpan currentTime, TimeSpan totalTime) { Invoke((MethodInvoker)delegate diff --git a/SharpCutCommon/Properties/AssemblyInfo.cs b/SharpCutCommon/Properties/AssemblyInfo.cs index 812bd27..9c56266 100644 --- a/SharpCutCommon/Properties/AssemblyInfo.cs +++ b/SharpCutCommon/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.4.7.0")] -[assembly: AssemblyFileVersion("1.4.7.0")] +[assembly: AssemblyVersion("1.4.8.0")] +[assembly: AssemblyFileVersion("1.4.8.0")] diff --git a/SharpCutCommon/SharpCutCommon.csproj b/SharpCutCommon/SharpCutCommon.csproj index c09a7f6..961b7b9 100644 --- a/SharpCutCommon/SharpCutCommon.csproj +++ b/SharpCutCommon/SharpCutCommon.csproj @@ -55,11 +55,11 @@ SharpCut.ico - - ..\packages\LibVLCSharp.3.8.2\lib\net471\LibVLCSharp.dll + + ..\packages\LibVLCSharp.3.9.0\lib\net471\LibVLCSharp.dll - - ..\packages\LibVLCSharp.WinForms.3.8.2\lib\net40\LibVLCSharp.WinForms.dll + + ..\packages\LibVLCSharp.WinForms.3.9.0\lib\net40\LibVLCSharp.WinForms.dll ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll diff --git a/SharpCutCommon/Video/FFMPEG.cs b/SharpCutCommon/Video/FFMPEG.cs index d62a2d3..fb85361 100644 --- a/SharpCutCommon/Video/FFMPEG.cs +++ b/SharpCutCommon/Video/FFMPEG.cs @@ -149,8 +149,6 @@ public void ExportSection(string mediaFileName, Section section, string containe .SetInputTime(TimeSpan.FromSeconds(section.End - section.Start)) .SetSeek(TimeSpan.FromSeconds(section.Start)) .AddParameter("-c copy") - .AddParameter("-map 0:0") - .AddParameter("-map 0:1") .SetOutput(outputFileName); StartAndAwaitConversion(conversion, outputFileName); diff --git a/SharpCutCommon/packages.config b/SharpCutCommon/packages.config index 1ee9356..68f4d64 100644 --- a/SharpCutCommon/packages.config +++ b/SharpCutCommon/packages.config @@ -1,7 +1,7 @@  - - + +