Reverting GitHub Windows builder to use ffmpeg (instead of ffmpeg 4.4…

…), and removing version logic around swresample/avresample logic - since GitHub versions are completely different than expected (for example: avformat version: 3.100 vs avformat version: 58.45.100)
OpenShot · Mar 10, 2023 · ec1bd01 · ec1bd01
1 parent 1c832dc
commit ec1bd01
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -114,7 +114,7 @@ jobs:
               mingw-w64-x86_64-qt5-winextras
               mingw-w64-x86_64-qt5-tools
               mingw-w64-x86_64-libvpx
-              mingw-w64-x86_64-ffmpeg4.4
+              mingw-w64-x86_64-ffmpeg
               mingw-w64-x86_64-zeromq
               mingw-w64-x86_64-opencv
               mingw-w64-x86_64-protobuf

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -336,7 +336,7 @@ set(all_comps avcodec avformat avutil swscale)
 set(version_comps avcodec avformat avutil)
 
 # Pick a resampler.  Prefer swresample if possible
-if(TARGET FFmpeg::swresample AND ${FFmpeg_avformat_VERSION} VERSION_GREATER "57.0.0")
+if(TARGET FFmpeg::swresample)
   set(resample_lib swresample)
   set(USE_SW TRUE)
 else()