Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Switching FFmpeg to 4.2.1 #10

Merged
merged 2 commits into from
Sep 9, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ 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).

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

Expand All @@ -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

Expand Down
2 changes: 1 addition & 1 deletion ffmpeg-android-maker.sh
Original file line number Diff line number Diff line change
@@ -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.
Expand Down