Skip to content

Commit

Permalink
Merge branch 'development' into update/mbedtls_3.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
Javernaut committed Nov 11, 2023
2 parents 11b5b8f + f070451 commit fc7a42c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The script also produces `ffmpeg` and `ffprobe` executables that can be used in

The main focus of ffmpeg-android-maker is to prepare shared libraries for seamless integration into an Android project. The script prepares the `output` directory that is meant to be used. And it's not the only thing this project does.

By default this script downloads and builds the FFmpeg **6.0**, but the version can be overridden.
By default this script downloads and builds the FFmpeg **6.1**, but the version can be overridden.

The details of how this script is implemented are described in this series of posts:
* [Part 1](https://proandroiddev.com/a-story-about-ffmpeg-in-android-part-i-compilation-898e4a249422)
Expand Down
2 changes: 1 addition & 1 deletion scripts/parse-arguments.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
ABIS_TO_BUILD=()
API_LEVEL=19
SOURCE_TYPE=TAR
SOURCE_VALUE=6.0
SOURCE_VALUE=6.1
EXTERNAL_LIBRARIES=()
FFMPEG_GPL_ENABLED=false

Expand Down

0 comments on commit fc7a42c

Please sign in to comment.