From 556b859e5e46f47dd421c85582d553755ee3e9fa Mon Sep 17 00:00:00 2001 From: Sylvain Berfini Date: Thu, 3 Jul 2014 10:39:48 +0200 Subject: [PATCH] Updated ms2 and Android.mk for openh264 update --- build/android/Android.mk | 2 +- mediastreamer2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build/android/Android.mk b/build/android/Android.mk index 438732952..817aba539 100755 --- a/build/android/Android.mk +++ b/build/android/Android.mk @@ -203,7 +203,7 @@ endif ifeq ($(BUILD_OPENH264),1) LOCAL_STATIC_LIBRARIES += \ libmsopenh264 \ - libwels + libopenh264 endif endif diff --git a/mediastreamer2 b/mediastreamer2 index 61420e49b..facff7237 160000 --- a/mediastreamer2 +++ b/mediastreamer2 @@ -1 +1 @@ -Subproject commit 61420e49b468d441bc085da117a67b1a400f58de +Subproject commit facff72371337393ffb61f70a8a13f74111db2aa