commit 1bbfb57d71e7b02de7714c928d853994b0a2a3ea
author henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Mar 03 17:37:52 2014 +0000
committer henrike@webrtc.org <henrike@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Mon Mar 03 17:37:52 2014 +0000
tree b495d6aa28ef4a7df3d3a8d99f578dd38819b767
parent 0117d1c48c698de58889e72ee15772654000277c

Rollback of r5629 "(Auto)update libjingle 62364298-> 62368661".

BUG=N/A
R=wu@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/9329004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5631 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/examples/call/call_main.cc

diff --git a/talk/examples/call/call_main.cc b/talk/examples/call/call_main.cc
index 25c33ff..2ee796b 100644
--- a/talk/examples/call/call_main.cc
+++ b/talk/examples/call/call_main.cc
@@ -45,6 +45,9 @@
 #include "talk/examples/call/console.h"
 #include "talk/examples/call/mediaenginefactory.h"
 #include "talk/p2p/base/constants.h"
+#ifdef ANDROID
+#include "talk/media/other/androidmediaengine.h"
+#endif
 #include "talk/session/media/mediasessionclient.h"
 #include "talk/session/media/srtpfilter.h"
 #include "talk/xmpp/xmppauth.h"
@@ -182,7 +185,7 @@
 static std::vector<cricket::AudioCodec> codecs;
 static const cricket::AudioCodec ISAC(103, "ISAC", 40000, 16000, 1, 0);
 
-cricket::MediaEngineInterface *CreateAndroidMediaEngine() {
+cricket::MediaEngine *AndroidMediaEngineFactory() {
     cricket::FakeMediaEngine *engine = new cricket::FakeMediaEngine();
 
     codecs.push_back(ISAC);
@@ -435,7 +438,7 @@
   }
 
 #ifdef ANDROID
-  MediaEngineFactory::SetCreateFunction(&CreateAndroidMediaEngine);
+  InitAndroidMediaEngineFactory(AndroidMediaEngineFactory);
 #endif
 
 #if WIN32