From 1cdf5e79e3a5bdab0c708f3a55c4e5fcf381de04 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Thu, 26 Nov 2020 13:50:46 +0000 Subject: [PATCH] Rename the FFMPEG extension binary to ffmpegJNI Instead of ffmpeg_jni for consistency with other extensions. PiperOrigin-RevId: 344411014 --- .../google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java | 2 +- extensions/ffmpeg/src/main/jni/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java index 5bc225baa2..50201887e6 100644 --- a/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java +++ b/extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java @@ -34,7 +34,7 @@ public final class FfmpegLibrary { private static final String TAG = "FfmpegLibrary"; - private static final LibraryLoader LOADER = new LibraryLoader("ffmpeg_jni"); + private static final LibraryLoader LOADER = new LibraryLoader("ffmpegJNI"); private static @MonotonicNonNull String version; private static int inputBufferPaddingSize = C.LENGTH_UNSET; diff --git a/extensions/ffmpeg/src/main/jni/CMakeLists.txt b/extensions/ffmpeg/src/main/jni/CMakeLists.txt index bc1009e131..fd3e398dd9 100644 --- a/extensions/ffmpeg/src/main/jni/CMakeLists.txt +++ b/extensions/ffmpeg/src/main/jni/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR) # Enable C++11 features. set(CMAKE_CXX_STANDARD 11) -project(libffmpeg_jni C CXX) +project(libffmpegJNI C CXX) set(ffmpeg_location "${CMAKE_CURRENT_SOURCE_DIR}/ffmpeg") set(ffmpeg_binaries "${ffmpeg_location}/android-libs/${ANDROID_ABI}") @@ -24,11 +24,11 @@ endforeach() include_directories(${ffmpeg_location}) find_library(android_log_lib log) -add_library(ffmpeg_jni +add_library(ffmpegJNI SHARED ffmpeg_jni.cc) -target_link_libraries(ffmpeg_jni +target_link_libraries(ffmpegJNI PRIVATE android PRIVATE swresample PRIVATE avcodec