summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2014-12-08 15:05:49 +0100
committerMax Kellermann <max@duempel.org>2014-12-08 15:05:49 +0100
commit4acbf7b90d9fbca42328f682cdb8ac8cacc13759 (patch)
treef9c8f3801ed2f4c7bf0e02db3c0d34e9e5d13c9a
parentcbc1a58e937f36b6fd9381067132f6dfec99895c (diff)
android/build.py: update FFmpeg to 2.5
-rw-r--r--NEWS1
-rwxr-xr-xandroid/build.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index b52e6e5d2..a9cb567d4 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ ver 0.19.6 (not yet released)
* fix build failure with musl
* android
- update libFLAC to 1.3.1
+ - update FFmpeg to 2.5
ver 0.19.5 (2014/11/26)
* input
diff --git a/android/build.py b/android/build.py
index 67f8bcb3b..8455dd6a9 100755
--- a/android/build.py
+++ b/android/build.py
@@ -341,8 +341,8 @@ thirdparty_libs = [
),
FfmpegProject(
- 'http://ffmpeg.org/releases/ffmpeg-2.4.3.tar.bz2',
- '8da635baff57d7ab704b1daca5a99b47',
+ 'http://ffmpeg.org/releases/ffmpeg-2.5.tar.bz2',
+ '4346fe710cc6bdd981f6534d2420d1ab',
'lib/libavcodec.a',
[
'--disable-shared', '--enable-static',