ffmpeg: fix ffmpeg recipe by using h264+aac, since the previous version are not working anymore with python-for-android.

tito · tito · commit 26e8ea0b48c1 · 2012-02-19T17:14:02.000+01:00
diff --git a/recipes/ffmpeg/recipe.sh b/recipes/ffmpeg/recipe.sh
@@ -1,19 +1,17 @@
 #!/bin/bash
+# Recent change made ffmpeg not compatible with python-for-android yet.
+# Only h264+aac build are working.
 
 VERSION_ffmpeg=
-URL_ffmpeg=
+URL_ffmpeg=https://github.com/tito/ffmpeg-android/zipball/master/ffmpeg-android.zip
 DEPS_ffmpeg=(python sdl)
 MD5_ffmpeg=
 BUILD_ffmpeg=$BUILD_PATH/ffmpeg/ffmpeg-android
 RECIPE_ffmpeg=$RECIPES_PATH/ffmpeg
 
 function prebuild_ffmpeg() {
-	cd $BUILD_PATH/ffmpeg
-
-	if [ ! -d ffmpeg-android ]; then
-		# initial clone
-		try git clone git://github.com/tito/ffmpeg-android
-		try cd ffmpeg-android
+	cd $BUILD_ffmpeg
+	if [ ! -d ffmpeg ]; then
 		try ./extract.sh
 	fi
 }
@@ -25,10 +23,11 @@ function build_ffmpeg() {
 		return
 	fi
 
+
 	# build ffmpeg
 	export NDK=$ANDROIDNDK
 	if [ ! -f $BUILD_ffmpeg/build/ffmpeg/armeabi-v7a/lib/libavcodec.a ]; then
-		try ./build.sh
+		try env FFMPEG_ARCHS='armv7a' ./build-h264-aac.sh
 	fi
 
 	push_arm
@@ -37,6 +36,7 @@ function build_ffmpeg() {
 	export JNI_PATH=$JNI_PATH
 	export CFLAGS="$CFLAGS -I$JNI_PATH/sdl/include -I$JNI_PATH/sdl_mixer/"
 	export LDFLAGS="$LDFLAGS -lm -L$LIBS_PATH"
+	export FFMPEG_ROOT="$BUILD_ffmpeg/build/ffmpeg/armeabi-v7a"
 	try cd $BUILD_ffmpeg/python
 	try find . -iname '*.pyx' -exec cython {} \;
 	try $BUILD_PATH/python-install/bin/python.host setup.py build_ext -v
