From ec1bd0185aa480faeb4f362bdb2c09e13a2f6daf Mon Sep 17 00:00:00 2001 From: Jonathan Thomas Date: Fri, 10 Mar 2023 14:36:08 -0600 Subject: [PATCH] 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) --- .github/workflows/ci.yml | 2 +- src/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e233a5eb..9639c80e 100644 --- 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 index ba193baa..5e823791 100644 --- 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()