sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add additional build flags for ffmpeg on "arm64-v8a"

Browse source 
From NDK 23.1.7779620 and above, the arm64-v8a ABI needs additional
build flags to correctly link the ffmpeg libraries.

Issue: google/ExoPlayer#9933
PiperOrigin-RevId: 467161973
This commit is contained in:
tonihei 2022-08-12 09:43:22 +00:00 committed by Marc Baechinger
parent b125d45a63
commit 5874327e5d
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
RELEASENOTES.md
View file

@ -50,6 +50,9 @@
* Add timeout for loading ad information to handle cases where the IMA SDK * Add timeout for loading ad information to handle cases where the IMA SDK
gets stuck loading an ad gets stuck loading an ad
([#10510](https://github.com/google/ExoPlayer/issues/10510)). ([#10510](https://github.com/google/ExoPlayer/issues/10510)).
* FFmpeg extension:
* Add newly required flags to link FFmpeg libraries with NDK 23.1.7779620
and above ([#9933](https://github.com/google/ExoPlayer/issues/9933)).
### 1.0.0-beta02 (2022-07-21) ### 1.0.0-beta02 (2022-07-21)

6
libraries/decoder_ffmpeg/src/main/jni/CMakeLists.txt
View file

@ -21,6 +21,12 @@ set(CMAKE_CXX_STANDARD 11)
project(libffmpegJNI C CXX) project(libffmpegJNI C CXX)
# Additional flags needed for "arm64-v8a" from NDK 23.1.7779620 and above.
# See https://github.com/google/ExoPlayer/issues/9933#issuecomment-1029775358.
if(${ANDROID_ABI} MATCHES "arm64-v8a")
set(CMAKE_CXX_FLAGS "-Wl,-Bsymbolic")
endif()
set(ffmpeg_location "${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg") set(ffmpeg_location "${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg")
set(ffmpeg_binaries "${ffmpeg_location}/android-libs/${ANDROID_ABI}") set(ffmpeg_binaries "${ffmpeg_location}/android-libs/${ANDROID_ABI}")