From 4f466533766d6c0ec59fa07e0c3af26e3c051cc4 Mon Sep 17 00:00:00 2001
From: Matt Dawkins <matt.dawkins@kitware.com>
Date: Fri, 2 Dec 2022 22:54:00 -0500
Subject: [PATCH] Allow use of x264 for older ffmpeg

---
 CMake/External_FFmpeg.cmake |  4 ++--
 CMake/fletch-tarballs.cmake | 34 ++++++++++++++++++++--------------
 2 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/CMake/External_FFmpeg.cmake b/CMake/External_FFmpeg.cmake
index 981eea8b..41172be3 100644
--- a/CMake/External_FFmpeg.cmake
+++ b/CMake/External_FFmpeg.cmake
@@ -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)
diff --git a/CMake/fletch-tarballs.cmake b/CMake/fletch-tarballs.cmake
index 89064f79..0a0ef7ad 100644
--- a/CMake/fletch-tarballs.cmake
+++ b/CMake/fletch-tarballs.cmake
@@ -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
@@ -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")