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

Renamed ffmepg libraries to force Android to use ours in case the device embed it's own ffmepg

Browse source
This commit is contained in:
Sylvain Berfini 2013-07-11 13:42:23 +02:00
parent f506ccd7d4
commit fb1762a135
7 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
jni/Application.mk
View file

@ -23,8 +23,8 @@ BUILD_SRTP=1
endif endif
ifeq ($(LINPHONE_VIDEO),1) ifeq ($(LINPHONE_VIDEO),1)
APP_MODULES += libavutil libavcore libavcodec libswscale APP_MODULES += liblinavutil liblinavcore liblinavcodec liblinswscale
APP_MODULES += libavutilnoneon libavcorenoneon libavcodecnoneon libswscalenoneon APP_MODULES += liblinavcodecnoneon
APP_MODULES += libvpx APP_MODULES += libvpx
endif endif

4
submodules/externals/build/ffmpeg-no-neon/Android_libavcodec.mk vendored
View file

@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)/../../ffmpeg LOCAL_PATH:= $(call my-dir)/../../ffmpeg
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libavcodecnoneon LOCAL_MODULE := liblinavcodecnoneon
LOCAL_SRC_FILES = \ LOCAL_SRC_FILES = \
libavcodec/allcodecs.c \ libavcodec/allcodecs.c \
@ -104,7 +104,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/ \ $(LOCAL_PATH)/ \
$(LOCAL_PATH)/libavutil $(LOCAL_PATH)/libavutil
LOCAL_SHARED_LIBRARIES := libavutil libavcore LOCAL_SHARED_LIBRARIES := liblinavutil liblinavcore
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
submodules/externals/build/ffmpeg/Android_libavcodec.mk vendored
View file

@ -1,7 +1,7 @@
LOCAL_PATH:= $(call my-dir)/../../ffmpeg LOCAL_PATH:= $(call my-dir)/../../ffmpeg
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libavcodec LOCAL_MODULE := liblinavcodec
LOCAL_SRC_FILES = \ LOCAL_SRC_FILES = \
libavcodec/allcodecs.c \ libavcodec/allcodecs.c \
@ -104,7 +104,7 @@ LOCAL_C_INCLUDES += \
$(LOCAL_PATH)/ \ $(LOCAL_PATH)/ \
$(LOCAL_PATH)/libavutil $(LOCAL_PATH)/libavutil
LOCAL_SHARED_LIBRARIES := libavutil libavcore LOCAL_SHARED_LIBRARIES := liblinavutil liblinavcore
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

4
submodules/externals/build/ffmpeg/Android_libavcore.mk vendored
View file

@ -2,7 +2,7 @@
LOCAL_PATH:= $(call my-dir)/../../ffmpeg/ LOCAL_PATH:= $(call my-dir)/../../ffmpeg/
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libavcore LOCAL_MODULE := liblinavcore
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@ -21,7 +21,7 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
#for including config.h: #for including config.h:
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg $(LOCAL_PATH)/ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg $(LOCAL_PATH)/
LOCAL_SHARED_LIBRARIES := libavutil LOCAL_SHARED_LIBRARIES := liblinavutil
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
submodules/externals/build/ffmpeg/Android_libavutil.mk vendored
View file

@ -2,7 +2,7 @@
LOCAL_PATH:= $(call my-dir)/../../ffmpeg/ LOCAL_PATH:= $(call my-dir)/../../ffmpeg/
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libavutil LOCAL_MODULE := liblinavutil
LOCAL_SRC_FILES = \ LOCAL_SRC_FILES = \

4
submodules/externals/build/ffmpeg/Android_libswscale.mk vendored
View file

@ -2,7 +2,7 @@
LOCAL_PATH:= $(call my-dir)/../../ffmpeg/libswscale/ LOCAL_PATH:= $(call my-dir)/../../ffmpeg/libswscale/
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libswscale LOCAL_MODULE := liblinswscale
LOCAL_SRC_FILES = \ LOCAL_SRC_FILES = \
options.c \ options.c \
@ -20,7 +20,7 @@ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../build/ffmpeg \
$(LOCAL_PATH)/ \ $(LOCAL_PATH)/ \
$(LOCAL_PATH)/../ $(LOCAL_PATH)/../
LOCAL_SHARED_LIBRARIES := libavutil LOCAL_SHARED_LIBRARIES := liblinavutil
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

2
submodules/linphone

@ -1 +1 @@
Subproject commit bdd9839dea820ec38171b3a6a8ea14358bf9210b Subproject commit 9bb6ac525b5471b3215d92e81d1b201b597ce712