Merge remote-tracking branch 'origin/master'

3 years ago · 3caf28464d
parent d728c1136e ba629d1a09
commit 3caf28464d
3 changed files with 2 additions and 2 deletions
--- a/picture/ffmpeg_group.png
+++ b/picture/ffmpeg_group.png
--- a/shell/ffmpeg/build_ffmpeg_mp3.sh
+++ b/shell/ffmpeg/build_ffmpeg_mp3.sh
@ -28,7 +28,7 @@ NATIVE_CPU='armv8-a'
 OPTIMIZE_CFLAGS=""
 fi

-export NDK=/Users/frank/Library/Android/android-ndk-r10e
+export NDK=/Users/frank/Library/Android/android-ndk-r15c
 export PREBUILT=$NDK/toolchains/$CPU-linux-$ANDROID-4.9/prebuilt
 export PLATFORM=$NDK/platforms/android-21/arch-$ARCH
 export TOOLCHAIN=$PREBUILT/darwin-x86_64
--- a/shell/ffmpeg/build_ffmpeg_x264.sh
+++ b/shell/ffmpeg/build_ffmpeg_x264.sh
@ -28,7 +28,7 @@ NATIVE_CPU='armv8-a'
 OPTIMIZE_CFLAGS=""
 fi

-export NDK=/Users/frank/Library/Android/android-ndk-r10e
+export NDK=/Users/frank/Library/Android/android-ndk-r15c
 export PREBUILT=$NDK/toolchains/$CPU-linux-$ANDROID-4.9/prebuilt
 export PLATFORM=$NDK/platforms/android-21/arch-$ARCH
 export TOOLCHAIN=$PREBUILT/darwin-x86_64