You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
Update to FFmpeg n6.1.2 to fix an issue with Rocky Linux 9 and vulkan (#633)
### Fix FFMPEG build error in Rocky Linux 9 CI
### Linked issues
n/a
### Summarize your change.
Updated FFmpeg to version n6.1.2 to fix the issue.
### Describe the reason for the change.
Rocky Linux 9 CI is failing.
### Describe what you have tested and on which operating system.
- [x] Rocky Linux 9
Signed-off-by: Cédrik Fuoco <[email protected]>
Copy file name to clipboardExpand all lines: cmake/dependencies/ffmpeg.cmake
+6-11Lines changed: 6 additions & 11 deletions
Original file line number
Diff line number
Diff line change
@@ -33,17 +33,15 @@ IF(RV_FFMPEG_7)
33
33
)
34
34
ELSEIF(RV_FFMPEG_6)
35
35
SET(_version
36
-
"n6.1.1"
36
+
"n6.1.2"
37
37
)
38
38
39
39
SET(_download_hash
40
-
"6dfc27fcb6da6f653c6ec025c2cd9b00"
40
+
"953b858e5be3ab66232bdbb90e42f50d"
41
41
)
42
42
ELSE()
43
-
# This shouldn't happen, but it could if there are changes the acceptable
44
-
# versions of FFmpeg in ffmpeg.cmake and this section is not
45
-
# updated accordingly.
46
-
message( FATAL_ERROR"The requested version of FFmpeg is not supported." )
43
+
# This shouldn't happen, but it could if there are changes the acceptable versions of FFmpeg in ffmpeg.cmake and this section is not updated accordingly.
44
+
MESSAGE(FATAL_ERROR"The requested version of FFmpeg is not supported.")
47
45
ENDIF()
48
46
49
47
SET(_download_url
@@ -81,7 +79,6 @@ ELSE()
81
79
)
82
80
ENDIF()
83
81
84
-
85
82
IF(RV_FFMPEG_7)
86
83
IF(RV_TARGET_DARWIN)
87
84
SET(_ffmpeg_avutil_lib_name
@@ -183,10 +180,8 @@ ELSEIF(RV_FFMPEG_6)
183
180
)
184
181
ENDIF()
185
182
ELSE()
186
-
# This shouldn't happen. But it could if there are changes the acceptable
187
-
# versions of FFmpeg in ffmpeg.cmake and this section is not
188
-
# updated accordingly.
189
-
message( FATAL_ERROR"The requested version of FFmpeg is not supported." )
183
+
# This shouldn't happen. But it could if there are changes the acceptable versions of FFmpeg in ffmpeg.cmake and this section is not updated accordingly.
184
+
MESSAGE(FATAL_ERROR"The requested version of FFmpeg is not supported.")
0 commit comments