From 612f0cf326f4d2c3abdb5cd6d7967b918a2ef7ac Mon Sep 17 00:00:00 2001 From: Pierre-Eric Pelloux-Prayer Date: Tue, 9 Aug 2011 16:51:55 +0200 Subject: [PATCH] android: vp8 integration --- build/android/Android.mk | 3 ++- mediastreamer2 | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/build/android/Android.mk b/build/android/Android.mk index dcc9c9fa6..8d72eb222 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -102,10 +102,11 @@ LOCAL_STATIC_LIBRARIES += \ endif ifeq ($(LINPHONE_VIDEO),1) +LOCAL_STATIC_LIBRARIES += libvpx ifeq ($(BUILD_X264),1) LOCAL_STATIC_LIBRARIES += \ libmsx264 \ - libx264 + libx264 endif LOCAL_SHARED_LIBRARIES += \ libavcodec \ diff --git a/mediastreamer2 b/mediastreamer2 index c2ec52b09..9300335bb 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit c2ec52b097ec3165cbfb2b93dc788383612e1569 +Subproject commit 9300335bbb536c4e67961c9c0b6b6b013fc4e8ff