Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

add msx264

Browse source
This commit is contained in:
Simon Morlat 2010-11-29 22:12:36 +01:00
parent 95c0b26ebe
commit c1238547be
6 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -28,3 +28,6 @@
[submodule "submodules/externals/x264"] [submodule "submodules/externals/x264"]
path = submodules/externals/x264 path = submodules/externals/x264
url = git://git.videolan.org/x264.git url = git://git.videolan.org/x264.git
[submodule "submodules/msx264"]
path = submodules/msx264
url = git://git.linphone.org/msx264.git

2
jni/Android.mk
View file

@ -18,8 +18,10 @@ include $(root-dir)/submodules/linphone/mediastreamer2/build/android/Android.mk
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
include $(root-dir)/submodules/msilbc/Android.mk include $(root-dir)/submodules/msilbc/Android.mk
include $(root-dir)/submodules/msx264/Android.mk
include $(root-dir)/submodules/externals/build/ffmpeg/Android.mk include $(root-dir)/submodules/externals/build/ffmpeg/Android.mk
include $(root-dir)/submodules/externals/build/x264/Android.mk include $(root-dir)/submodules/externals/build/x264/Android.mk
endif endif
include $(root-dir)/submodules/linphone/build/android/Android.mk include $(root-dir)/submodules/linphone/build/android/Android.mk

2
jni/Application.mk
View file

@ -3,7 +3,7 @@ APP_MODULES :=libspeex libgsm libortp libosip2 libeXosip2 libmediastreamer2
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
APP_MODULES +=libmsilbc libavutil libavcore libavcodec libswscale libx264 APP_MODULES +=libmsilbc libavutil libavcore libavcodec libswscale libx264 libmsx264
endif endif
APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
APP_PLATFORM := android-8 APP_PLATFORM := android-8

2
submodules/externals/build/x264/config.h vendored
View file

@ -4,7 +4,7 @@
#define HAVE_NEON 1 #define HAVE_NEON 1
#define ARCH_ARM 1 #define ARCH_ARM 1
#define SYS_LINUX 1 #define SYS_LINUX 1
#define HAVE_LOG2F 1 #define HAVE_LOG2F 0
#define fseek fseeko #define fseek fseeko
#define ftell ftello #define ftell ftello
#define BIT_DEPTH 8 #define BIT_DEPTH 8

2
submodules/linphone

@ -1 +1 @@
Subproject commit 7107aa1d1d7a5eaa3fbee6a7bae5766a5bc7bda6 Subproject commit 5cdf291009aa0481259b99ff15c62d0c178d5e36

1
submodules/msx264 Submodule

@ -0,0 +1 @@
Subproject commit e9852e6e87809242ad126fc776fa1373673ab7f2