openshot/libopenshot
0
0
Fork 0
mirror of https://github.com/OpenShot/libopenshot.git synced 2026-03-02 08:53:52 -08:00
Code Issues Packages Projects Releases Wiki Activity

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)

Browse Source
This commit is contained in:
Jonathan Thomas
2023-03-10 14:36:08 -06:00
parent 1c832dc1d5
commit ec1bd0185a
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@@ -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

2
src/CMakeLists.txt
View File

@@ -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()