From f9cd693145c0e6b62541868d39d6ae85b0279330 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Mon, 23 Jan 2012 16:56:13 +0000 Subject: [PATCH] Enable vp8 and videoengine on android Review URL: https://webrtc-codereview.appspot.com/368003 git-svn-id: http://webrtc.googlecode.com/svn/trunk@1510 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/video_coding/codecs/vp8/main/source/Android.mk | 3 +-- src/video_engine/vie_impl.cc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/modules/video_coding/codecs/vp8/main/source/Android.mk b/src/modules/video_coding/codecs/vp8/main/source/Android.mk index e09dce4404..eb6c1af889 100644 --- a/src/modules/video_coding/codecs/vp8/main/source/Android.mk +++ b/src/modules/video_coding/codecs/vp8/main/source/Android.mk @@ -18,8 +18,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_CPP_EXTENSION := .cc LOCAL_SRC_FILES := \ reference_picture_selection.cc \ - vp8.cc \ - vp8_simulcast.cc + vp8.cc # Flags passed to both C and C++ files. LOCAL_CFLAGS := \ diff --git a/src/video_engine/vie_impl.cc b/src/video_engine/vie_impl.cc index d697e00711..d8a421bb9d 100644 --- a/src/video_engine/vie_impl.cc +++ b/src/video_engine/vie_impl.cc @@ -206,7 +206,7 @@ int VideoEngine::SetTraceCallback(TraceCallback* callback) { return Trace::SetTraceCallback(callback); } -int VideoEngine::SetAndroidObjects(void* javaVM, void* java_context) { +int VideoEngine::SetAndroidObjects(void* javaVM, void* javaContext) { WEBRTC_TRACE(kTraceApiCall, kTraceVideo, g_vie_active_instance_counter, "SetAndroidObjects()");