Skip to content

Commit

Permalink
Add additional build flags for ffmpeg on "arm64-v8a"
Browse files Browse the repository at this point in the history
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
  • Loading branch information
tonihei authored and marcbaechinger committed Sep 30, 2022
1 parent b125d45 commit 5874327
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 0 deletions.
3 changes: 3 additions & 0 deletions RELEASENOTES.md
Expand Up @@ -50,6 +50,9 @@
* Add timeout for loading ad information to handle cases where the IMA SDK
gets stuck loading an ad
([#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)

Expand Down
6 changes: 6 additions & 0 deletions libraries/decoder_ffmpeg/src/main/jni/CMakeLists.txt
Expand Up @@ -21,6 +21,12 @@ set(CMAKE_CXX_STANDARD 11)

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_binaries "${ffmpeg_location}/android-libs/${ANDROID_ABI}")

Expand Down

0 comments on commit 5874327

Please sign in to comment.