From b9d026762d801f5c25973d402b0ecd59c17b7971 Mon Sep 17 00:00:00 2001
From: pelya <x.pelya.x@gmail.com>
Date: Mon, 6 Jun 2011 18:37:11 +0300
Subject: [PATCH] Fixed ffmpeg compilation

---
 project/jni/ffmpeg/Android.mk | 37 ++++++++++++++++++++++-------------
 project/jni/ffmpeg/dummy.c    |  7 +++++++
 project/jni/ffmpeg/ffmpeg.mk  | 21 --------------------
 3 files changed, 30 insertions(+), 35 deletions(-)
 create mode 100644 project/jni/ffmpeg/dummy.c
 delete mode 100644 project/jni/ffmpeg/ffmpeg.mk

diff --git a/project/jni/ffmpeg/Android.mk b/project/jni/ffmpeg/Android.mk
index 82bb16b2f..87c5f8e02 100644
--- a/project/jni/ffmpeg/Android.mk
+++ b/project/jni/ffmpeg/Android.mk
@@ -1,15 +1,24 @@
 LOCAL_PATH := $(call my-dir)
-FFMPEG_MODULE := avcodec
-include $(LOCAL_PATH)/ffmpeg.mk
-FFMPEG_MODULE := avcore
-include $(LOCAL_PATH)/ffmpeg.mk
-FFMPEG_MODULE := avdevice
-include $(LOCAL_PATH)/ffmpeg.mk
-FFMPEG_MODULE := avfilter
-include $(LOCAL_PATH)/ffmpeg.mk
-FFMPEG_MODULE := avformat
-include $(LOCAL_PATH)/ffmpeg.mk
-FFMPEG_MODULE := avutil
-include $(LOCAL_PATH)/ffmpeg.mk
-FFMPEG_MODULE := swscale
-include $(LOCAL_PATH)/ffmpeg.mk
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := $(notdir $(LOCAL_PATH))
+#ifeq ($(LOCAL_MODULE),ffmpeg)
+#$(error Do not use "ffmpeg" as dependency, use avformat, swscale etc)
+#endif
+
+LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
+
+ifneq ($(NDK_R5_TOOLCHAIN),)
+LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/lib$(LOCAL_MODULE).so
+include $(PREBUILT_SHARED_LIBRARY)
+else
+LOCAL_SRC_FILES := dummy.c
+include $(BUILD_SHARED_LIBRARY)
+$(abspath $(LOCAL_PATH)/../../obj/local/armeabi/lib$(LOCAL_MODULE).so): $(LOCAL_PATH)/lib/armeabi/lib$(LOCAL_MODULE).so OVERRIDE_CUSTOM_LIB
+	cp -f $< $@
+$(abspath $(LOCAL_PATH)/../../obj/local/armeabi-v7a/lib$(LOCAL_MODULE).so): $(LOCAL_PATH)/lib/armeabi-v7a/lib$(LOCAL_MODULE).so OVERRIDE_CUSTOM_LIB
+	cp -f $< $@
+.PHONY: OVERRIDE_CUSTOM_LIB
+OVERRIDE_CUSTOM_LIB:
+endif
diff --git a/project/jni/ffmpeg/dummy.c b/project/jni/ffmpeg/dummy.c
new file mode 100644
index 000000000..824cda3cc
--- /dev/null
+++ b/project/jni/ffmpeg/dummy.c
@@ -0,0 +1,7 @@
+
+int
+SDL_main(int argc, char *argv[])
+{
+	return 0;
+}
+
diff --git a/project/jni/ffmpeg/ffmpeg.mk b/project/jni/ffmpeg/ffmpeg.mk
deleted file mode 100644
index 5cd90a37b..000000000
--- a/project/jni/ffmpeg/ffmpeg.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-LOCAL_PATH := $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE := $(FFMPEG_MODULE)
-
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/include
-
-ifneq ($(NDK_R5_TOOLCHAIN),)
-LOCAL_SRC_FILES := lib/$(TARGET_ARCH_ABI)/$(FFMPEG_MODULE).so
-include $(PREBUILT_SHARED_LIBRARY)
-else
-LOCAL_SRC_FILES := dummy.c
-include $(BUILD_SHARED_LIBRARY)
-$(realpath $(LOCAL_PATH)/../../obj/local/armeabi/libboost_$(FFMPEG_MODULE).so): lib/armeabi/$(FFMPEG_MODULE).so OVERRIDE_CUSTOM_LIB
-	cp -f $< $@
-$(realpath $(LOCAL_PATH)/../../obj/local/armeabi-v7a/libboost_$(FFMPEG_MODULE).so): lib/armeabi-v7a/$(FFMPEG_MODULE).so OVERRIDE_CUSTOM_LIB
-	cp -f $< $@
-.PHONY: OVERRIDE_CUSTOM_LIB
-OVERRIDE_CUSTOM_LIB:
-endif