Skip to content

Commit 40ac4df

Browse files
Merge FFmpeg 6 feature branch into main by cherry-picking (#456)
### Merge FFmpeg 6 feature branch into main by cherry-picking ### Linked issues #388 ### Summarize your change. Merge FFmpeg 6 feature branch into main by cherry-picking ### Describe the reason for the change. Update OpenRV to FFmpeg 6 ### Describe what you have tested and on which operating system. - [x] Windows - [x] MacOS - [x] Rocky Linux ### Add a list of changes, and note any that might need special attention during the review. n\a ### If possible, provide screenshots. n\a --------- Signed-off-by: Sebastian Parborg <[email protected]> Signed-off-by: Cédrik Fuoco <[email protected]> Signed-off-by: Cédrik Fuoco <[email protected]> Signed-off-by: Cédrik Fuoco <[email protected]> Co-authored-by: DarkDefender <[email protected]>
1 parent 390d96e commit 40ac4df

File tree

3 files changed

+323
-476
lines changed

3 files changed

+323
-476
lines changed

cmake/dependencies/ffmpeg.cmake

Lines changed: 24 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ SET(_target
2424
)
2525

2626
SET(_version
27-
"n4.4.3"
27+
"n6.1.1"
2828
)
2929
SET(_download_url
3030
"https://github.com/FFmpeg/FFmpeg/archive/refs/tags/${_version}.zip"
3131
)
3232

3333
SET(_download_hash
34-
"51ffa9de9e5b0c17cbabc0d8b780beb2"
34+
"6dfc27fcb6da6f653c6ec025c2cd9b00"
3535
)
3636

3737
SET(_base_dir
@@ -80,51 +80,51 @@ ENDIF()
8080

8181
IF(RV_TARGET_DARWIN)
8282
SET(_ffmpeg_avutil_lib_name
83-
${CMAKE_SHARED_LIBRARY_PREFIX}avutil.56${CMAKE_SHARED_LIBRARY_SUFFIX}
83+
${CMAKE_SHARED_LIBRARY_PREFIX}avutil.58${CMAKE_SHARED_LIBRARY_SUFFIX}
8484
)
8585
SET(_ffmpeg_swresample_lib_name
86-
${CMAKE_SHARED_LIBRARY_PREFIX}swresample.3${CMAKE_SHARED_LIBRARY_SUFFIX}
86+
${CMAKE_SHARED_LIBRARY_PREFIX}swresample.4${CMAKE_SHARED_LIBRARY_SUFFIX}
8787
)
8888
SET(_ffmpeg_swscale_lib_name
89-
${CMAKE_SHARED_LIBRARY_PREFIX}swscale.5${CMAKE_SHARED_LIBRARY_SUFFIX}
89+
${CMAKE_SHARED_LIBRARY_PREFIX}swscale.7${CMAKE_SHARED_LIBRARY_SUFFIX}
9090
)
9191
SET(_ffmpeg_avcodec_lib_name
92-
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec.58${CMAKE_SHARED_LIBRARY_SUFFIX}
92+
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec.60${CMAKE_SHARED_LIBRARY_SUFFIX}
9393
)
9494
SET(_ffmpeg_avformat_lib_name
95-
${CMAKE_SHARED_LIBRARY_PREFIX}avformat.58${CMAKE_SHARED_LIBRARY_SUFFIX}
95+
${CMAKE_SHARED_LIBRARY_PREFIX}avformat.60${CMAKE_SHARED_LIBRARY_SUFFIX}
9696
)
9797
ELSEIF(RV_TARGET_LINUX)
9898
SET(_ffmpeg_avutil_lib_name
99-
${CMAKE_SHARED_LIBRARY_PREFIX}avutil${CMAKE_SHARED_LIBRARY_SUFFIX}.56
99+
${CMAKE_SHARED_LIBRARY_PREFIX}avutil${CMAKE_SHARED_LIBRARY_SUFFIX}.58
100100
)
101101
SET(_ffmpeg_swresample_lib_name
102-
${CMAKE_SHARED_LIBRARY_PREFIX}swresample${CMAKE_SHARED_LIBRARY_SUFFIX}.3
102+
${CMAKE_SHARED_LIBRARY_PREFIX}swresample${CMAKE_SHARED_LIBRARY_SUFFIX}.4
103103
)
104104
SET(_ffmpeg_swscale_lib_name
105-
${CMAKE_SHARED_LIBRARY_PREFIX}swscale${CMAKE_SHARED_LIBRARY_SUFFIX}.5
105+
${CMAKE_SHARED_LIBRARY_PREFIX}swscale${CMAKE_SHARED_LIBRARY_SUFFIX}.7
106106
)
107107
SET(_ffmpeg_avcodec_lib_name
108-
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec${CMAKE_SHARED_LIBRARY_SUFFIX}.58
108+
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec${CMAKE_SHARED_LIBRARY_SUFFIX}.60
109109
)
110110
SET(_ffmpeg_avformat_lib_name
111-
${CMAKE_SHARED_LIBRARY_PREFIX}avformat${CMAKE_SHARED_LIBRARY_SUFFIX}.58
111+
${CMAKE_SHARED_LIBRARY_PREFIX}avformat${CMAKE_SHARED_LIBRARY_SUFFIX}.60
112112
)
113113
ELSEIF(RV_TARGET_WINDOWS)
114114
SET(_ffmpeg_avutil_lib_name
115-
${CMAKE_SHARED_LIBRARY_PREFIX}avutil-56${CMAKE_SHARED_LIBRARY_SUFFIX}
115+
${CMAKE_SHARED_LIBRARY_PREFIX}avutil-58${CMAKE_SHARED_LIBRARY_SUFFIX}
116116
)
117117
SET(_ffmpeg_swresample_lib_name
118-
${CMAKE_SHARED_LIBRARY_PREFIX}swresample-3${CMAKE_SHARED_LIBRARY_SUFFIX}
118+
${CMAKE_SHARED_LIBRARY_PREFIX}swresample-4${CMAKE_SHARED_LIBRARY_SUFFIX}
119119
)
120120
SET(_ffmpeg_swscale_lib_name
121-
${CMAKE_SHARED_LIBRARY_PREFIX}swscale-5${CMAKE_SHARED_LIBRARY_SUFFIX}
121+
${CMAKE_SHARED_LIBRARY_PREFIX}swscale-7${CMAKE_SHARED_LIBRARY_SUFFIX}
122122
)
123123
SET(_ffmpeg_avcodec_lib_name
124-
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec-58${CMAKE_SHARED_LIBRARY_SUFFIX}
124+
${CMAKE_SHARED_LIBRARY_PREFIX}avcodec-60${CMAKE_SHARED_LIBRARY_SUFFIX}
125125
)
126126
SET(_ffmpeg_avformat_lib_name
127-
${CMAKE_SHARED_LIBRARY_PREFIX}avformat-58${CMAKE_SHARED_LIBRARY_SUFFIX}
127+
${CMAKE_SHARED_LIBRARY_PREFIX}avformat-60${CMAKE_SHARED_LIBRARY_SUFFIX}
128128
)
129129
ENDIF()
130130

@@ -207,6 +207,7 @@ IF(NOT RV_FFMPEG_CONFIG_OPTIONS)
207207
LIST(APPEND _disabled_decoders "--disable-decoder=prores")
208208
LIST(APPEND _disabled_decoders "--disable-decoder=qtrle")
209209
LIST(APPEND _disabled_decoders "--disable-decoder=aac")
210+
LIST(APPEND _disabled_decoders "--disable-decoder=aac_at")
210211
LIST(APPEND _disabled_decoders "--disable-decoder=aac_fixed")
211212
LIST(APPEND _disabled_decoders "--disable-decoder=aac_latm")
212213
LIST(APPEND _disabled_decoders "--disable-decoder=dvvideo")
@@ -323,6 +324,12 @@ FOREACH(
323324
LIST(APPEND RV_DEPS_LIST ffmpeg::${_ffmpeg_lib})
324325
ENDFOREACH()
325326

327+
328+
TARGET_LINK_LIBRARIES(
329+
ffmpeg::avutil
330+
INTERFACE OpenSSL::Crypto
331+
)
332+
326333
TARGET_LINK_LIBRARIES(
327334
ffmpeg::swresample
328335
INTERFACE ffmpeg::avutil

0 commit comments

Comments
 (0)