From df93e8fd085c7370defe2437610884b5b50e2aed Mon Sep 17 00:00:00 2001 From: Hitesh Sondhi Date: Mon, 15 Sep 2014 12:47:18 +0530 Subject: [PATCH 1/2] Updated ffmpeg to v2.4 --- ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg b/ffmpeg index bc25918..ace90ee 160000 --- a/ffmpeg +++ b/ffmpeg @@ -1 +1 @@ -Subproject commit bc259185cb69c6532232be4b2ad57a70ef7ed946 +Subproject commit ace90ee26550dc08b7ec48cd1675862f1b0ef8d4 From 9306fa2c4f227edeb66f2e84e2d6eb784402a48b Mon Sep 17 00:00:00 2001 From: Hitesh Sondhi Date: Mon, 15 Sep 2014 13:08:23 +0530 Subject: [PATCH 2/2] Updated README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a3c8ea..7544f67 100755 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Instructions * To update submodules and libraries you can use ./init_update_libs.sh command * Find the executable binary in build directory. * If you want to use FONTCONFIG then you need to specify your custom fontconfig config file (e.g - "FONTCONFIG_FILE=/sdcard/fonts.conf ./ffmpeg --version", where /sdcard/fonts.conf is location of your FONTCONFIG configuration file). -* You can also download [prebuilt-binaries.zip](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.0/prebuilt-binaries.zip) [prebuilt-binaries.tar.gz](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.0/prebuilt-binaries.tar.gz) here. +* You can also download [prebuilt-binaries.zip](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.1/prebuilt-binaries.zip) [prebuilt-binaries.tar.gz](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.1/prebuilt-binaries.tar.gz) here. License ----