From 8d09206ffda8100a8210602749d45deb38f9373d Mon Sep 17 00:00:00 2001 From: Hitesh Sondhi Date: Tue, 7 Oct 2014 14:57:26 +0530 Subject: [PATCH 1/2] Updated FFmpeg to 2.4.2 --- ffmpeg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg b/ffmpeg index ace90ee..d61454e 160000 --- a/ffmpeg +++ b/ffmpeg @@ -1 +1 @@ -Subproject commit ace90ee26550dc08b7ec48cd1675862f1b0ef8d4 +Subproject commit d61454e7c1de48f6a9059ca98f55e6beb52a618c From 4a00419bb40deb2d3ff1508ea23de63bf8ce3e90 Mon Sep 17 00:00:00 2001 From: Hitesh Sondhi Date: Tue, 7 Oct 2014 15:27:04 +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 24c5547..4e97264 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.2/prebuilt-binaries.zip) [prebuilt-binaries.tar.gz](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.2/prebuilt-binaries.tar.gz) here. +* You can also download [prebuilt-binaries.zip](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.3/prebuilt-binaries.zip) [prebuilt-binaries.tar.gz](https://github.com/hiteshsondhi88/ffmpeg-android/releases/download/v0.3.3/prebuilt-binaries.tar.gz) here. License ----