Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow use of x264 for older ffmpeg #724

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Allow use of x264 for older ffmpeg #724

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions CMake/External_FFmpeg.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ else()
endif()

if(fletch_ENABLE_x264)
if(_FFmpeg_version VERSION_LESS 4.4.1)
message(WARNING "FFmpeg version ${_FFmpeg_version} will not build against x264. Version 4.4.1 required.")
if(_FFmpeg_version VERSION_LESS 3.0)
message(WARNING "FFmpeg version ${_FFmpeg_version} will not build against x264. Version 3.0 required.")
else()
include(External_x264)
list(APPEND ffmpeg_DEPENDS x264)
Expand Down
34 changes: 20 additions & 14 deletions CMake/fletch-tarballs.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,20 +96,6 @@ if(WIN32)
set(msys2_md5 "45b3be3d1e30d01e0d95d5bd8e75244a")
endif()

# x264
set(x264_version "bfc87b7a330f75f5c9a21e56081e4b20344f139e")
set(x264_url "https://code.videolan.org/videolan/x264/-/archive/${x264_version}/x264-${x264_version}.tar.bz2")
set(x264_md5 "fd71fead6422ccb5094207c9d2ad70bd")

# x265
set(x265_version "3.4")
set(x265_url "https://github.com/videolan/x265/archive/refs/tags/${x265_version}.tar.gz")
set(x265_md5 "d867c3a7e19852974cf402c6f6aeaaf3")

# FFmpeg NVidia codec headers
set(ffnvcodec_version "n11.1.5.1")
set(ffnvcodec_url "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git")

# FFmpeg
if (fletch_ENABLE_FFmpeg OR fletch_ENABLE_ALL_PACKAGES)
# allow different versions to be selected for testing purposes
Expand Down Expand Up @@ -137,6 +123,26 @@ if (fletch_ENABLE_FFmpeg OR fletch_ENABLE_ALL_PACKAGES)
set(fletch_ENABLE_ffnvcodec ON CACHE BOOL "Include FFmpeg NVidia codec headers")
endif()

# x264
if(_FFmpeg_version VERSION_LESS 4.0.0)
set(x264_version "8c297425")
set(x264_url "https://code.videolan.org/videolan/x264/-/archive/${x264_version}/x264-${x264_version}.zip")
set(x264_md5 "fcfb16d13b3ca540aefeae36c37c4edd")
else()
set(x264_version "bfc87b7a330f75f5c9a21e56081e4b20344f139e")
set(x264_url "https://code.videolan.org/videolan/x264/-/archive/${x264_version}/x264-${x264_version}.tar.bz2")
set(x264_md5 "fd71fead6422ccb5094207c9d2ad70bd")
endif()

# x265
set(x265_version "3.4")
set(x265_url "https://github.com/videolan/x265/archive/refs/tags/${x265_version}.tar.gz")
set(x265_md5 "d867c3a7e19852974cf402c6f6aeaaf3")

# FFmpeg NVidia codec headers
set(ffnvcodec_version "n11.1.5.1")
set(ffnvcodec_url "https://git.videolan.org/git/ffmpeg/nv-codec-headers.git")

# EIGEN
set(Eigen_version 3.3.9)
set(Eigen_url "https://gitlab.com/libeigen/eigen/-/archive/${Eigen_version}/eigen-${Eigen_version}.tar.gz")
Expand Down