Windows - Fix FFmpeg Binaries

NickvisionApps · Jan 6, 2025 · fa6a7c2 · fa6a7c2
1 parent db40798
commit fa6a7c2
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 12 deletions.
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -23,10 +23,12 @@ jobs:
         with:
           submodules: recursive
       - name: "Setup Environment"
+        shell: pwsh
         run: |
+          $ProgressPreference = 'SilentlyContinue'
           mkdir build
-          powershell -command "Invoke-WebRequest https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-shared-64.zip -OutFile gettext.zip"
-          powershell -command "Expand-Archive -Force 'gettext.zip'"
+          Invoke-WebRequest https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-shared-64.zip -OutFile gettext.zip
+          Expand-Archive -Force 'gettext.zip'
           move gettext\bin\* C:\Windows\System32
           choco install innosetup
       - name: "Vcpkg"
@@ -45,17 +47,19 @@ jobs:
           cmake --build . --config Release
       - name: "Create Installer"
         working-directory: ${{github.workspace}}/inno
+        shell: pwsh
         run: |
-          powershell -command "Invoke-WebRequest https://aka.ms/vs/17/release/vc_redist.x64.exe -OutFile vc_redist.x64.exe"
-          powershell -command "Invoke-WebRequest https://github.com/yt-dlp/yt-dlp/releases/download/2024.12.23/yt-dlp.exe -OutFile yt-dlp.exe"
-          powershell -command "Invoke-WebRequest https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0-win-64bit-build1.zip -OutFile aria2.zip"
-          powershell -command "Invoke-WebRequest https://github.com/GyanD/codexffmpeg/releases/download/7.1/ffmpeg-7.1-full_build.zip -OutFile ffmpeg.zip"
-          powershell -command "Expand-Archive -Force 'aria2.zip'"
-          powershell -command "Expand-Archive -Force 'ffmpeg.zip'"
+          $ProgressPreference = 'SilentlyContinue'
+          Invoke-WebRequest https://aka.ms/vs/17/release/vc_redist.x64.exe -OutFile vc_redist.x64.exe
+          Invoke-WebRequest https://github.com/yt-dlp/yt-dlp/releases/download/2024.12.23/yt-dlp.exe -OutFile yt-dlp.exe
+          Invoke-WebRequest https://github.com/aria2/aria2/releases/download/release-1.37.0/aria2-1.37.0-win-64bit-build1.zip -OutFile aria2.zip
+          Invoke-WebRequest https://github.com/yt-dlp/FFmpeg-Builds/releases/download/latest/ffmpeg-n7.1-latest-win64-gpl-7.1.zip -OutFile ffmpeg.zip
+          Expand-Archive -Force 'aria2.zip'
+          Expand-Archive -Force 'ffmpeg.zip'
           move aria2\aria2-1.37.0-win-64bit-build1\aria2c.exe aria2c.exe
-          move ffmpeg\ffmpeg-7.1-full_build\bin\ffmpeg.exe ffmpeg.exe
-          move ffmpeg\ffmpeg-7.1-full_build\bin\ffprobe.exe ffprobe.exe
-          move ffmpeg\ffmpeg-7.1-full_build\bin\ffplay.exe ffplay.exe
+          move ffmpeg\ffmpeg-n7.1-latest-win64-gpl-7.1\bin\ffmpeg.exe ffmpeg.exe
+          move ffmpeg\ffmpeg-n7.1-latest-win64-gpl-7.1\bin\ffprobe.exe ffprobe.exe
+          move ffmpeg\ffmpeg-n7.1-latest-win64-gpl-7.1\bin\ffplay.exe ffplay.exe
           iscc setup.iss
       - name: Upload
         uses: actions/upload-artifact@v4

diff --git a/libparabolic/src/controllers/mainwindowcontroller.cpp b/libparabolic/src/controllers/mainwindowcontroller.cpp
@@ -43,7 +43,7 @@ namespace Nickvision::TubeConverter::Shared::Controllers
         m_appInfo.setVersion({ "2025.1.0-next" });
         m_appInfo.setShortName(_("Parabolic"));
         m_appInfo.setDescription(_("Download web video and audio"));
-        m_appInfo.setChangelog("- Fixed an issue where some video downloads contained no audio\n- Fixed an issue where downloads would not stop on Windows\n- Fixed an issue where paths with accent marks were not handled correctly on Windows");
+        m_appInfo.setChangelog("- Fixed an issue where some video downloads contained no audio\n- Fixed an issue where downloads would not stop on Windows\n- Fixed an issue where paths with accent marks were not handled correctly on Windows\n- Fixed an issue where the bundled ffmpeg did not work correctly on some Windows systems");
         m_appInfo.setSourceRepo("https://github.com/NickvisionApps/Parabolic");
         m_appInfo.setIssueTracker("https://github.com/NickvisionApps/Parabolic/issues/new");
         m_appInfo.setSupportUrl("https://github.com/NickvisionApps/Parabolic/discussions");

diff --git a/resources/linux/org.nickvision.tubeconverter.metainfo.xml.in b/resources/linux/org.nickvision.tubeconverter.metainfo.xml.in
@@ -60,6 +60,7 @@
         <p>- Fixed an issue where some video downloads contained no audio</p>
         <p>- Fixed an issue where downloads would not stop on Windows</p>
         <p>- Fixed an issue where paths with accent marks were not handled correctly on Windows</p>
+        <p>- Fixed an issue where the bundled ffmpeg did not work correctly on some Windows systems</p>
       </description>
     </release>
   </releases>