Switching FFmpeg to 4.2

pull/10/head
Javernaut 5 years ago
parent cbd525e033
commit 8227b3257a
  1. 11
      README.md
  2. 4
      ffmpeg-android-maker.sh

@ -2,13 +2,16 @@
[![Build Status](https://travis-ci.org/Javernaut/ffmpeg-android-maker.svg?branch=master)](https://travis-ci.org/Javernaut/ffmpeg-android-maker) [![Build Status](https://travis-ci.org/Javernaut/ffmpeg-android-maker.svg?branch=master)](https://travis-ci.org/Javernaut/ffmpeg-android-maker)
Here is a script that downloads the source code of [FFmpeg](https://www.ffmpeg.org) library and assembles it for Android. The script produces shared libraries as well as header files. The output structure looks like this: Here is a script that downloads the source code of [FFmpeg](https://www.ffmpeg.org) library and assembles it for Android. The script produces shared libraries as well as header files. The output structure looks like this:
<img src="https://github.com/Javernaut/ffmpeg-android-maker/blob/master/images/output_structure.png" width="200">
<img src="https://github.com/Javernaut/ffmpeg-android-maker/blob/master/images/output_structure.png" width="200">
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 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.1.4** (but can be overridden). And the script expects to use **at least** Android NDK **r19** (*r20* also works ok). Starting with FFmpeg 4.1 and NDK r19 the whole process became much simpler.
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).
## Supported Android ABIs ## Supported Android ABIs
a
* armeabi-v7a * armeabi-v7a
* arm64-v8a * arm64-v8a
* x86 * x86

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
FFMPEG_FALLBACK_VERSION=4.1.4 FFMPEG_FALLBACK_VERSION=4.2
# Assuming the script is used on macOS or Linux machine # Assuming the script is used on macOS or Linux machine
case "$OSTYPE" in case "$OSTYPE" in
@ -90,7 +90,7 @@ function ensureSources() {
ensureSourcesBranch ${SECOND_ARGUMENT} ensureSourcesBranch ${SECOND_ARGUMENT}
;; ;;
*) *)
echo "Using FFmpeg 4.1.4" echo "Using FFmpeg ${FFMPEG_FALLBACK_VERSION}"
ensureSourcesTag ${FFMPEG_FALLBACK_VERSION} ensureSourcesTag ${FFMPEG_FALLBACK_VERSION}
;; ;;
esac esac

Loading…
Cancel
Save