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

move ffmpeg git tree to videolan

Browse source
This commit is contained in:
Jehan Monnier 2011-03-17 10:59:50 +01:00
parent e7697429c4
commit 50622d1700
3 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.gitmodules vendored
View file

@ -21,10 +21,7 @@
url = git://git.linphone.org/libilbc-rfc3951.git url = git://git.linphone.org/libilbc-rfc3951.git
[submodule "submodules/externals/ffmpeg"] [submodule "submodules/externals/ffmpeg"]
path = submodules/externals/ffmpeg path = submodules/externals/ffmpeg
url = git://git.ffmpeg.org/ffmpeg url = git://git.videolan.org/ffmpeg
[submodule "submodules/externals/libswscale"]
path = submodules/externals/libswscale
url = git://git.ffmpeg.org/libswscale
[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

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

@ -1,5 +1,5 @@
##lib swcale################### ##lib swcale###################
LOCAL_PATH:= $(call my-dir)/../../libswscale/ LOCAL_PATH:= $(call my-dir)/../../ffmpeg/libswscale/
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libswscale LOCAL_MODULE := libswscale
@ -16,8 +16,7 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H
LOCAL_ARM_MODE := arm LOCAL_ARM_MODE := arm
#for including config.h: #for including config.h:
LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg \ LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../build/ffmpeg \
$(LOCAL_PATH)/../ffmpeg \
$(LOCAL_PATH)/ \ $(LOCAL_PATH)/ \
$(LOCAL_PATH)/../ $(LOCAL_PATH)/../

1
submodules/externals/libswscale vendored

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