Commit 1cdf5e79 by aquilescanta Committed by Andrew Lewis

Rename the FFMPEG extension binary to ffmpegJNI

Instead of ffmpeg_jni for consistency with other extensions.

PiperOrigin-RevId: 344411014
parent dd0246a3
...@@ -34,7 +34,7 @@ public final class FfmpegLibrary { ...@@ -34,7 +34,7 @@ public final class FfmpegLibrary {
private static final String TAG = "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 @MonotonicNonNull String version;
private static int inputBufferPaddingSize = C.LENGTH_UNSET; private static int inputBufferPaddingSize = C.LENGTH_UNSET;
......
...@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR) ...@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.7.1 FATAL_ERROR)
# Enable C++11 features. # Enable C++11 features.
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)
project(libffmpeg_jni C CXX) project(libffmpegJNI C CXX)
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}")
...@@ -24,11 +24,11 @@ endforeach() ...@@ -24,11 +24,11 @@ endforeach()
include_directories(${ffmpeg_location}) include_directories(${ffmpeg_location})
find_library(android_log_lib log) find_library(android_log_lib log)
add_library(ffmpeg_jni add_library(ffmpegJNI
SHARED SHARED
ffmpeg_jni.cc) ffmpeg_jni.cc)
target_link_libraries(ffmpeg_jni target_link_libraries(ffmpegJNI
PRIVATE android PRIVATE android
PRIVATE swresample PRIVATE swresample
PRIVATE avcodec PRIVATE avcodec
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment