Skip to content

Commit 3163d33

Browse files
wysaidwysaid
committed
fix some compile issue & add arch for x86_64, upgrade ffmpeg
1 parent f5fa4f8 commit 3163d33

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+6031
-3221
lines changed

‎library/src/main/jni/Android.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ LOCAL_SRC_FILES := \
7373
$(CGE_SOURCE)/filters/cgeEdgeFilter.cpp \
7474
$(CGE_SOURCE)/filters/cgeEmbossFilter.cpp \
7575
$(CGE_SOURCE)/filters/cgeCrosshatchFilter.cpp \
76-
$(CGE_SOURCE)/filters/CGELiquifyFilter.cpp \
76+
$(CGE_SOURCE)/filters/cgeLiquifyFilter.cpp \
7777
$(CGE_SOURCE)/filters/cgeRandomBlurFilter.cpp \
7878
$(CGE_SOURCE)/filters/cgeMinValueFilter.cpp \
7979
$(CGE_SOURCE)/filters/cgeMaxValueFilter.cpp \

‎library/src/main/jni/Application.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

2-
APP_ABI := armeabi-v7a arm64-v8a x86
2+
# APP_ABI := armeabi-v7a arm64-v8a x86
33
# armeabi & mips are deprecated
4-
#APP_ABI := armeabi-v7a
4+
APP_ABI := all
55

66
APP_PLATFORM := android-16
77

‎library/src/main/jni/ffmpeg/arm64-v8a/libffmpeg.so‎

-177 KB
Binary file not shown.

‎library/src/main/jni/ffmpeg/armeabi-v7a/libffmpeg.so‎

-162 KB
Binary file not shown.

‎library/src/main/jni/ffmpeg/armeabi/libffmpeg.so‎

-3.86 MB
Binary file not shown.

0 commit comments

Comments
 (0)