k
/
FFmpegAndroid
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
dev
xufulong 3 years ago
parent d728c1136e ba629d1a09
commit 3caf28464d
3 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. BIN
      picture/ffmpeg_group.png
  2. 2
      shell/ffmpeg/build_ffmpeg_mp3.sh
  3. 2
      shell/ffmpeg/build_ffmpeg_x264.sh

BIN
picture/ffmpeg_group.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 74 KiB

After

Width:  |  Height:  |  Size: 62 KiB

2
shell/ffmpeg/build_ffmpeg_mp3.sh
Unescape View File

@ -28,7 +28,7 @@ NATIVE_CPU='armv8-a'
OPTIMIZE_CFLAGS="" OPTIMIZE_CFLAGS=""
fi 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 PREBUILT=$NDK/toolchains/$CPU-linux-$ANDROID-4.9/prebuilt
export PLATFORM=$NDK/platforms/android-21/arch-$ARCH export PLATFORM=$NDK/platforms/android-21/arch-$ARCH
export TOOLCHAIN=$PREBUILT/darwin-x86_64 export TOOLCHAIN=$PREBUILT/darwin-x86_64

2
shell/ffmpeg/build_ffmpeg_x264.sh
Unescape View File

@ -28,7 +28,7 @@ NATIVE_CPU='armv8-a'
OPTIMIZE_CFLAGS="" OPTIMIZE_CFLAGS=""
fi 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 PREBUILT=$NDK/toolchains/$CPU-linux-$ANDROID-4.9/prebuilt
export PLATFORM=$NDK/platforms/android-21/arch-$ARCH export PLATFORM=$NDK/platforms/android-21/arch-$ARCH
export TOOLCHAIN=$PREBUILT/darwin-x86_64 export TOOLCHAIN=$PREBUILT/darwin-x86_64

Write Preview
Loading…
Cancel
Save