Commit 90b52123 by ibaker Committed by Oliver Woodman

Simplify the ffmpeg build instructions a little

In-line EXOPLAYER_ROOT which only has one reference. And change
FFMPEG_EXT_PATH to always include "/jni"

PiperOrigin-RevId: 270866662
parent 719029d1
Showing with 3 additions and 4 deletions
...@@ -25,8 +25,7 @@ follows: ...@@ -25,8 +25,7 @@ follows:
``` ```
cd "<path to exoplayer checkout>" cd "<path to exoplayer checkout>"
EXOPLAYER_ROOT="$(pwd)" FFMPEG_EXT_PATH="$(pwd)/extensions/ffmpeg/src/main/jni"
FFMPEG_EXT_PATH="${EXOPLAYER_ROOT}/extensions/ffmpeg/src/main"
``` ```
* Download the [Android NDK][] and set its location in an environment variable. * Download the [Android NDK][] and set its location in an environment variable.
...@@ -69,7 +68,7 @@ COMMON_OPTIONS="\ ...@@ -69,7 +68,7 @@ COMMON_OPTIONS="\
--enable-decoder=opus \ --enable-decoder=opus \
--enable-decoder=flac \ --enable-decoder=flac \
" && \ " && \
cd "${FFMPEG_EXT_PATH}/jni" && \ cd "${FFMPEG_EXT_PATH}" && \
(git -C ffmpeg pull || git clone git://source.ffmpeg.org/ffmpeg ffmpeg) && \ (git -C ffmpeg pull || git clone git://source.ffmpeg.org/ffmpeg ffmpeg) && \
cd ffmpeg && git checkout release/4.0 && \ cd ffmpeg && git checkout release/4.0 && \
./configure \ ./configure \
...@@ -112,7 +111,7 @@ make clean ...@@ -112,7 +111,7 @@ make clean
built in the previous step. For example: built in the previous step. For example:
``` ```
cd "${FFMPEG_EXT_PATH}"/jni && \ cd "${FFMPEG_EXT_PATH}" && \
${NDK_PATH}/ndk-build APP_ABI="armeabi-v7a arm64-v8a x86" -j4 ${NDK_PATH}/ndk-build APP_ABI="armeabi-v7a arm64-v8a x86" -j4
``` ```
......
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