sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-26 09:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename the FFMPEG extension binary to ffmpegJNI

Browse source 
Instead of ffmpeg_jni for consistency with other extensions.

PiperOrigin-RevId: 344411014
This commit is contained in:
aquilescanta 2020-11-26 13:50:46 +00:00 committed by Andrew Lewis
parent dd0246a31c
commit 1cdf5e79e3
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extensions/ffmpeg/src/main/java/com/google/android/exoplayer2/ext/ffmpeg/FfmpegLibrary.java
View file

@ -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;

6
extensions/ffmpeg/src/main/jni/CMakeLists.txt
View file

@ -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