Fix for DJI drone footage not exporting due to stream mapping issues +

LibVLCSharp bump
philipbutkiewicz · Sep 3, 2024 · 5fa6422 · 5fa6422
1 parent 113d96b
commit 5fa6422
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 26 deletions.
diff --git 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
@@ -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
@@ -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
@@ -60,11 +60,11 @@
     <ApplicationIcon>SharpCut.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LibVLCSharp, Version=3.8.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibVLCSharp.3.8.2\lib\net471\LibVLCSharp.dll</HintPath>
+    <Reference Include="LibVLCSharp, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibVLCSharp.3.9.0\lib\net471\LibVLCSharp.dll</HintPath>
     </Reference>
-    <Reference Include="LibVLCSharp.WinForms, Version=3.8.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibVLCSharp.WinForms.3.8.2\lib\net40\LibVLCSharp.WinForms.dll</HintPath>
+    <Reference Include="LibVLCSharp.WinForms, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibVLCSharp.WinForms.3.9.0\lib\net40\LibVLCSharp.WinForms.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

diff --git a/SharpCut/packages.config b/SharpCut/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibVLCSharp" version="3.8.2" targetFramework="net481" />
-  <package id="LibVLCSharp.WinForms" version="3.8.2" targetFramework="net481" />
+  <package id="LibVLCSharp" version="3.9.0" targetFramework="net481" />
+  <package id="LibVLCSharp.WinForms" version="3.9.0" targetFramework="net481" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Memory" version="4.5.5" targetFramework="net472" />

diff --git 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
@@ -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
@@ -55,11 +55,11 @@
     <ApplicationIcon>SharpCut.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="LibVLCSharp, Version=3.8.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibVLCSharp.3.8.2\lib\net471\LibVLCSharp.dll</HintPath>
+    <Reference Include="LibVLCSharp, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibVLCSharp.3.9.0\lib\net471\LibVLCSharp.dll</HintPath>
     </Reference>
-    <Reference Include="LibVLCSharp.WinForms, Version=3.8.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\LibVLCSharp.WinForms.3.8.2\lib\net40\LibVLCSharp.WinForms.dll</HintPath>
+    <Reference Include="LibVLCSharp.WinForms, Version=3.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\LibVLCSharp.WinForms.3.9.0\lib\net40\LibVLCSharp.WinForms.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

diff --git 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
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="LibVLCSharp" version="3.8.2" targetFramework="net481" />
-  <package id="LibVLCSharp.WinForms" version="3.8.2" targetFramework="net481" />
+  <package id="LibVLCSharp" version="3.9.0" targetFramework="net481" />
+  <package id="LibVLCSharp.WinForms" version="3.9.0" targetFramework="net481" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Memory" version="4.5.5" targetFramework="net472" />
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		Sun 05/12/2024 11:56:54.54
		Tue 09/03/2024 22:50:26.42