ijkmedia: move to commit folder for share

ijkmediademo/.classpath → android/ijkmediademo/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ijkmediawidget"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/ijkmediaplayer"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

ijkmediaplayer/.classpath → android/ijkmediaplayer/.classpath

 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
 	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
 	<classpathentry kind="output" path="bin/classes"/>
 </classpath>

ijkmediaplayer/jni/Android.mk → android/ijkmediaplayer/jni/Android.mk

@@ -20,11 +20,10 @@ LOCAL_PATH := $(call my-dir)
 
 MY_APP_JNI_ROOT := $(realpath $(LOCAL_PATH))
 MY_APP_PRJ_ROOT := $(realpath $(MY_APP_JNI_ROOT)/..)
-MY_APP_REPO_ROOT := $(realpath $(MY_APP_PRJ_ROOT)/..)
+MY_APP_ANDROID_ROOT := $(realpath $(MY_APP_PRJ_ROOT)/..)
 
 # armeabi-v7a
-MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_REPO_ROOT)/build/ffmpeg-armv7a/output)
+MY_APP_FFMPEG_OUTPUT_PATH := $(realpath $(MY_APP_ANDROID_ROOT)/build/ffmpeg-armv7a/output)
 MY_APP_FFMPEG_INCLUDE_PATH := $(realpath $(MY_APP_FFMPEG_OUTPUT_PATH)/include)
-MY_APP_FFMPEG_INCLUDE_PATH_ALTER := $(realpath $(MY_APP_REPO_ROOT)/ffmpeg/include)
 
 include $(call all-subdir-makefiles)

android/ijkmediaplayer/jni/ijkmedia

+../../../ijkmedia
\ No newline at end of file

ijkmedia/Android.mk

+# copyright (c) 2013 Zhang Rui <bbcallen@gmail.com>
+#
+# This file is part of ijkPlayer.
+#
+# ijkPlayer is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# ijkPlayer is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with ijkPlayer; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+
+LOCAL_PATH := $(call my-dir)
+include $(call all-subdir-makefiles)

ijkmedia/ijkmedia

+ijkmedia
\ No newline at end of file

ijkmediaplayer/jni/ijkplayer/Android.mk → ijkmedia/ijkplayer/Android.mk

@@ -24,9 +24,8 @@ LOCAL_CFLAGS += -std=c99
 LOCAL_LDLIBS += -llog -landroid
 
 LOCAL_C_INCLUDES += $(LOCAL_PATH)
+LOCAL_C_INCLUDES += $(realpath $(LOCAL_PATH)/..)
 LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH)
-LOCAL_C_INCLUDES += $(MY_APP_FFMPEG_INCLUDE_PATH_ALTER)
-LOCAL_C_INCLUDES += $(MY_APP_JNI_ROOT)
 
 LOCAL_SRC_FILES += ff_cmdutils.c
 LOCAL_SRC_FILES += ff_ffplay.c