From a3cd36beb14cec70531fe9cbdedf4e59ba01f399 Mon Sep 17 00:00:00 2001 From: aquilescanta Date: Wed, 16 Sep 2020 16:35:26 +0100 Subject: [PATCH] Update the FFmpeg extension readme to use symlinking PiperOrigin-RevId: 332012857 --- extensions/ffmpeg/README.md | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/extensions/ffmpeg/README.md b/extensions/ffmpeg/README.md index ed5d2aba32..f3001427b8 100644 --- a/extensions/ffmpeg/README.md +++ b/extensions/ffmpeg/README.md @@ -41,19 +41,15 @@ NDK_PATH="" HOST_PLATFORM="linux-x86_64" ``` -* Fetch FFmpeg: +* Fetch FFmpeg and checkout an appropriate branch. We cannot guarantee + compatibility with all versions of FFmpeg. We currently recommend version 4.2: ``` -cd "${FFMPEG_EXT_PATH}/jni" && \ -git clone git://source.ffmpeg.org/ffmpeg ffmpeg -``` - -* Checkout an appropriate branch of FFmpeg. We cannot guarantee compatibility - with all versions of FFmpeg. We currently recommend version 4.2: - -``` -cd "${FFMPEG_EXT_PATH}/jni/ffmpeg" && \ -git checkout release/4.2 +cd "" && \ +git clone git://source.ffmpeg.org/ffmpeg && \ +cd ffmpeg && \ +git checkout release/4.2 && \ +FFMPEG_PATH="$(pwd)" ``` * Configure the decoders to include. See the [Supported formats][] page for @@ -63,6 +59,13 @@ git checkout release/4.2 ENABLED_DECODERS=(vorbis opus flac) ``` +* Add a link to the FFmpeg source code in the FFmpeg extension `jni` directory. + +``` +cd "${FFMPEG_EXT_PATH}/jni" && \ +ln -s "$FFMPEG_PATH" ffmpeg +``` + * Execute `build_ffmpeg.sh` to build FFmpeg for `armeabi-v7a`, `arm64-v8a`, `x86` and `x86_64`. The script can be edited if you need to build for different architectures: