mirror of
https://github.com/OpenMW/openmw.git
synced 2025-02-06 12:45:36 +00:00
Merge branch 'ffmpeg-fix' into 'master'
Don't try to detect correct ffmpeg version for android See merge request OpenMW/openmw!4223
This commit is contained in:
commit
7d884747fa
1 changed files with 2 additions and 2 deletions
|
@ -316,8 +316,8 @@ find_package(FFmpeg REQUIRED COMPONENTS AVCODEC AVFORMAT AVUTIL SWSCALE SWRESAMP
|
|||
if(FFmpeg_FOUND)
|
||||
SET(FFVER_OK TRUE)
|
||||
|
||||
# Can not detect FFmpeg version on Windows for now
|
||||
if (NOT WIN32)
|
||||
# Can not detect FFmpeg version on Windows or Android for now
|
||||
if (NOT WIN32 AND NOT ANDROID)
|
||||
if(FFmpeg_AVFORMAT_VERSION VERSION_LESS "57.56.100")
|
||||
message(STATUS "libavformat is too old! (${FFmpeg_AVFORMAT_VERSION}, wanted 57.56.100)")
|
||||
set(FFVER_OK FALSE)
|
||||
|
|
Loading…
Reference in a new issue