blob: d1c4251d901f3049afc7bf1aaede90651471f063 (
plain)
--- oiio-Release-2.2.21.0/src/cmake/modules/FindFFmpeg.cmake 2022-07-02 00:43:12.000000000 +0200
+++ oiio-Release-2.2.21.0-fixed/src/cmake/modules/FindFFmpeg.cmake 2022-11-09 20:24:14.949122097 +0100
@@ -59,17 +59,19 @@
endif ()
if (FFMPEG_INCLUDES)
- file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
+ file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version_major.h" TMP
REGEX "^#define LIBAVCODEC_VERSION_MAJOR .*$")
- string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MAJOR ${TMP})
+ string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MAJOR "${TMP}")
file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
REGEX "^#define LIBAVCODEC_VERSION_MINOR .*$")
- string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MINOR ${TMP})
+ string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MINOR "${TMP}")
file(STRINGS "${FFMPEG_INCLUDES}/libavcodec/version.h" TMP
REGEX "^#define LIBAVCODEC_VERSION_MICRO .*$")
- string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MICRO ${TMP})
+ string (REGEX MATCHALL "[0-9]+[.0-9]+" LIBAVCODEC_VERSION_MICRO "${TMP}")
set (LIBAVCODEC_VERSION "${LIBAVCODEC_VERSION_MAJOR}.${LIBAVCODEC_VERSION_MINOR}.${LIBAVCODEC_VERSION_MICRO}")
- if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.18.100)
+ if (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.37.100)
+ set (FFMPEG_VERSION 5.1)
+ elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 59.18.100)
set (FFMPEG_VERSION 5.0)
elseif (LIBAVCODEC_VERSION VERSION_GREATER_EQUAL 58.134.100)
set (FFMPEG_VERSION 4.4)
|
