Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / libjingle / source / talk / media / base / hybridvideoengine.cc

diff --git a/src/third_party/libjingle/source/talk/media/base/hybridvideoengine.cc b/src/third_party/libjingle/source/talk/media/base/hybridvideoengine.cc
index 8e992f0..289c4fe 100644 (file)
--- a/src/third_party/libjingle/source/talk/media/base/hybridvideoengine.cc
+++ b/src/third_party/libjingle/source/talk/media/base/hybridvideoengine.cc
@@ -27,7 +27,7 @@
 
 #include "talk/media/base/hybridvideoengine.h"
 
-#include "talk/base/logging.h"
+#include "webrtc/base/logging.h"
 
 namespace cricket {
 
@@ -281,7 +281,7 @@ bool HybridVideoMediaChannel::GetStats(
 }
 
 void HybridVideoMediaChannel::OnPacketReceived(
-    talk_base::Buffer* packet, const talk_base::PacketTime& packet_time) {
+    rtc::Buffer* packet, const rtc::PacketTime& packet_time) {
   // Eat packets until we have an active channel;
   if (active_channel_) {
     active_channel_->OnPacketReceived(packet, packet_time);
@@ -291,7 +291,7 @@ void HybridVideoMediaChannel::OnPacketReceived(
 }
 
 void HybridVideoMediaChannel::OnRtcpReceived(
-    talk_base::Buffer* packet, const talk_base::PacketTime& packet_time) {
+    rtc::Buffer* packet, const rtc::PacketTime& packet_time) {
   // Eat packets until we have an active channel;
   if (active_channel_) {
     active_channel_->OnRtcpReceived(packet, packet_time);