Update packaged ffmpeg to 4.3.1 (closes #69)

Maxstupo · Sep 21, 2020 · 9f4f6bf · 9f4f6bf
1 parent bfbf4c7
commit 9f4f6bf
Show file tree

Hide file tree

Showing 24 changed files with 687 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -49,7 +49,7 @@ This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md
 ## Acknowledgments
 
 * [youtube-dl](https://github.com/rg3/youtube-dl)
-* [ffmpeg](https://www.ffmpeg.org/) - compiled binaries from [ffmpeg.zeranoe.com](https://ffmpeg.zeranoe.com/builds/)
+* [ffmpeg](https://www.ffmpeg.org/) - compiled using [ffmpeg-windows-build-helpers](https://github.com/rdp/ffmpeg-windows-build-helpers)
 * [ByteSize](https://github.com/omar/ByteSize)
 * [Json.NET](https://github.com/JamesNK/Newtonsoft.Json)
 * [Fody](https://github.com/Fody/Fody/) & [Fody.Costura](https://github.com/Fody/Costura)
diff --git a/YDL-UI/Settings/Preferences.cs b/YDL-UI/Settings/Preferences.cs
@@ -113,7 +113,7 @@ public class PreferencesBinaries {
         public string YoutubeDl { get; set; } = "bin\\youtube-dl.exe";
 
         [JsonProperty(PropertyName = "ffmpeg")]
-        public string Ffmpeg { get; set; } = "bin\\ffmpeg.exe";
+        public string Ffmpeg { get; set; } = "bin\\ffmpeg\\ffmpeg.exe";
 
     }
 

diff --git a/YDL-UI/YDL-UI.csproj b/YDL-UI/YDL-UI.csproj
@@ -365,37 +365,37 @@
     <None Include="ydl-ui_1.ico" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="bin\avcodec-58.dll">
+    <Content Include="bin\ffmpeg\avcodec-58.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="bin\avdevice-58.dll">
+    <Content Include="bin\ffmpeg\avdevice-58.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="bin\avfilter-7.dll">
+    <Content Include="bin\ffmpeg\avfilter-7.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="bin\avformat-58.dll">
+    <Content Include="bin\ffmpeg\avformat-58.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="bin\avutil-56.dll">
+    <Content Include="bin\ffmpeg\avresample-4.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="bin\ffmpeg.exe">
+    <Content Include="bin\ffmpeg\avutil-56.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="bin\ffplay.exe">
+    <Content Include="bin\ffmpeg\ffmpeg.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="bin\ffprobe.exe">
+    <Content Include="bin\ffmpeg\ffprobe.exe">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="bin\postproc-55.dll">
+    <Content Include="bin\ffmpeg\postproc-55.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="bin\swresample-3.dll">
+    <Content Include="bin\ffmpeg\swresample-3.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
-    <Content Include="bin\swscale-5.dll">
+    <Content Include="bin\ffmpeg\swscale-5.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
     <Content Include="bin\youtube-dl.exe">

diff --git a/YDL-UI/bin/avdevice-58.dll b/YDL-UI/bin/avdevice-58.dll
diff --git a/YDL-UI/bin/avfilter-7.dll b/YDL-UI/bin/avfilter-7.dll
diff --git a/YDL-UI/bin/avutil-56.dll b/YDL-UI/bin/avutil-56.dll
diff --git a/YDL-UI/bin/ffmpeg.exe b/YDL-UI/bin/ffmpeg.exe
diff --git a/YDL-UI/bin/ffmpeg/LICENSE.md b/YDL-UI/bin/ffmpeg/LICENSE.md
diff --git a/YDL-UI/bin/avcodec-58.dll → YDL-UI/bin/ffmpeg/avcodec-58.dll b/YDL-UI/bin/avcodec-58.dll → YDL-UI/bin/ffmpeg/avcodec-58.dll
diff --git a/YDL-UI/bin/ffmpeg/avdevice-58.dll b/YDL-UI/bin/ffmpeg/avdevice-58.dll
diff --git a/YDL-UI/bin/ffmpeg/avfilter-7.dll b/YDL-UI/bin/ffmpeg/avfilter-7.dll
diff --git a/YDL-UI/bin/avformat-58.dll → YDL-UI/bin/ffmpeg/avformat-58.dll b/YDL-UI/bin/avformat-58.dll → YDL-UI/bin/ffmpeg/avformat-58.dll
diff --git a/YDL-UI/bin/ffmpeg/avresample-4.dll b/YDL-UI/bin/ffmpeg/avresample-4.dll
diff --git a/YDL-UI/bin/ffmpeg/avutil-56.dll b/YDL-UI/bin/ffmpeg/avutil-56.dll
diff --git a/YDL-UI/bin/ffmpeg/ffmpeg.exe b/YDL-UI/bin/ffmpeg/ffmpeg.exe
diff --git a/YDL-UI/bin/ffmpeg/ffprobe.exe b/YDL-UI/bin/ffmpeg/ffprobe.exe
diff --git a/YDL-UI/bin/ffmpeg/postproc-55.dll b/YDL-UI/bin/ffmpeg/postproc-55.dll
diff --git a/YDL-UI/bin/ffmpeg/swresample-3.dll b/YDL-UI/bin/ffmpeg/swresample-3.dll
diff --git a/YDL-UI/bin/ffmpeg/swscale-5.dll b/YDL-UI/bin/ffmpeg/swscale-5.dll
diff --git a/YDL-UI/bin/ffplay.exe b/YDL-UI/bin/ffplay.exe
diff --git a/YDL-UI/bin/ffprobe.exe b/YDL-UI/bin/ffprobe.exe
diff --git a/YDL-UI/bin/postproc-55.dll b/YDL-UI/bin/postproc-55.dll
diff --git a/YDL-UI/bin/swresample-3.dll b/YDL-UI/bin/swresample-3.dll
diff --git a/YDL-UI/bin/swscale-5.dll b/YDL-UI/bin/swscale-5.dll