From 50622d1700fdf34bdcd42dfda5ae99c94f398349 Mon Sep 17 00:00:00 2001 From: Jehan Monnier Date: Thu, 17 Mar 2011 10:59:50 +0100 Subject: [PATCH] move ffmpeg git tree to videolan --- .gitmodules | 5 +---- submodules/externals/build/ffmpeg/Android_libswscale.mk | 5 ++--- submodules/externals/libswscale | 1 - 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 160000 submodules/externals/libswscale diff --git a/.gitmodules b/.gitmodules index bfd0edac3..872f2e8e9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -21,10 +21,7 @@ url = git://git.linphone.org/libilbc-rfc3951.git [submodule "submodules/externals/ffmpeg"] path = submodules/externals/ffmpeg - url = git://git.ffmpeg.org/ffmpeg -[submodule "submodules/externals/libswscale"] - path = submodules/externals/libswscale - url = git://git.ffmpeg.org/libswscale + url = git://git.videolan.org/ffmpeg [submodule "submodules/externals/x264"] path = submodules/externals/x264 url = git://git.videolan.org/x264.git diff --git a/submodules/externals/build/ffmpeg/Android_libswscale.mk b/submodules/externals/build/ffmpeg/Android_libswscale.mk index 6bd8cc828..bbf4a5a34 100755 --- a/submodules/externals/build/ffmpeg/Android_libswscale.mk +++ b/submodules/externals/build/ffmpeg/Android_libswscale.mk @@ -1,5 +1,5 @@ ##lib swcale################### -LOCAL_PATH:= $(call my-dir)/../../libswscale/ +LOCAL_PATH:= $(call my-dir)/../../ffmpeg/libswscale/ include $(CLEAR_VARS) LOCAL_MODULE := libswscale @@ -16,8 +16,7 @@ LOCAL_CFLAGS += -DHAVE_AV_CONFIG_H LOCAL_ARM_MODE := arm #for including config.h: -LOCAL_C_INCLUDES += $(LOCAL_PATH)/../build/ffmpeg \ - $(LOCAL_PATH)/../ffmpeg \ +LOCAL_C_INCLUDES += $(LOCAL_PATH)/../../build/ffmpeg \ $(LOCAL_PATH)/ \ $(LOCAL_PATH)/../ diff --git a/submodules/externals/libswscale b/submodules/externals/libswscale deleted file mode 160000 index e75b939d4..000000000 --- a/submodules/externals/libswscale +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e75b939d479ce8120d2d30d7275849e3377a990e