From 9b9d3bc2e304d33eb9a208d42d185e127f125da7 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Mon, 9 Sep 2019 18:40:04 +0300 Subject: [PATCH 1/2] Switching FFmpeg to 4.2.1 --- README.md | 2 +- ffmpeg-android-maker.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 2f4dff5..38127bb 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Here is a script that downloads the source code of [FFmpeg](https://www.ffmpeg.o The actual content of all this directories depends on how the FFmpeg was configured before assembling. For my purpose I enabled only *libavcodec*, *libavformat*, *libavutil* and *libswscale*, but you can set your own configuration to make the FFmpeg you need. -The version of FFmpeg here by default is **4.2** (but can be overridden). And the script expects to use **at least** Android NDK **r19** (*r20* also works ok). +The version of FFmpeg here by default is **4.2.1** (but can be overridden). And the script expects to use **at least** Android NDK **r19** (*r20* also works ok). ## Supported Android ABIs diff --git a/ffmpeg-android-maker.sh b/ffmpeg-android-maker.sh index a6217ae..dc10feb 100755 --- a/ffmpeg-android-maker.sh +++ b/ffmpeg-android-maker.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -FFMPEG_FALLBACK_VERSION=4.2 +FFMPEG_FALLBACK_VERSION=4.2.1 # Defining a toolchan directory's name according to the current OS. # Assume that proper version of NDK is installed. From 0984bc07212ae2049638cadc90b17bf3248ac6a3 Mon Sep 17 00:00:00 2001 From: Javernaut Date: Mon, 9 Sep 2019 18:46:46 +0300 Subject: [PATCH 2/2] Adding the link to the details of the script working to README.md --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 38127bb..8c2b021 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,8 @@ The actual content of all this directories depends on how the FFmpeg was configu The version of FFmpeg here by default is **4.2.1** (but can be overridden). And the script expects to use **at least** Android NDK **r19** (*r20* also works ok). +The details of how this script is implemented are described in [this blog post](https://proandroiddev.com/a-story-about-ffmpeg-in-android-part-i-compilation-898e4a249422). + ## Supported Android ABIs * armeabi-v7a @@ -29,7 +31,7 @@ You have to define an environment variable `ANDROID_NDK_HOME` and set it to a co ## See it in action -Actual Android app that uses the output of the script can be found [here](https://github.com/Javernaut/WhatTheCodec) +Actual Android app that uses the output of the script can be found [here](https://github.com/Javernaut/WhatTheCodec). ## Features