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

Merge branch 'master' of git.linphone.org:linphone-android

Browse source
This commit is contained in:
Guillaume Beraudo 2011-06-06 15:05:09 +02:00
commit 6f5d3710b2
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
submodules/externals/build/speex/Android.mk vendored
View file

@ -87,7 +87,7 @@ ifeq ($(TARGET_ARCH),arm)
LOCAL_CFLAGS += $(FIXED_POINT_FLAGS) LOCAL_CFLAGS += $(FIXED_POINT_FLAGS)
LOCAL_CFLAGS += -DOVERRIDE_INTERPOLATE_PRODUCT_SINGLE -Dinterpolate_product_single=interpolate_product_single_int LOCAL_CFLAGS += -DOVERRIDE_INTERPOLATE_PRODUCT_SINGLE -Dinterpolate_product_single=interpolate_product_single_int
ifeq ($(LINPHONE_VIDEO),1) ifeq ($(LINPHONE_VIDEO),1)
LOCAL_CFLAGS += -DOVERRIDE_INNER_PRODUCT_SINGLE -Dinner_product_single=ff_scalarproduct_int16_neon LOCAL_CFLAGS += -DOVERRIDE_INNER_PRODUCT_SINGLE -Dinner_product_single=msresampler_scalarproduct_int16
endif endif
endif endif
else else

2
submodules/linphone

@ -1 +1 @@
Subproject commit c097b9ab6319e2a7ef758032c0ed6d41e009bedb Subproject commit 391091cead70994de0c78fb4b9bc2b82d0cb98e0