commit d4e598d57aed714a599444a7eab5e8fdde52a950
author buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jul 29 17:36:52 2014 +0000
committer buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jul 29 17:36:52 2014 +0000
tree 67b1dcdcff833ff9e790a23ae35f5f1edeea0c28
parent fc8b0871d9142bb2ca66d4e6ebb278083141e9d3

(Auto)update libjingle 72097588-> 72159069

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

talk/media/base/videoadapter.h

diff --git a/talk/media/base/videoadapter.h b/talk/media/base/videoadapter.h
index 8881837..50b4a13 100644
--- a/talk/media/base/videoadapter.h
+++ b/talk/media/base/videoadapter.h
@@ -26,10 +26,10 @@
 #ifndef TALK_MEDIA_BASE_VIDEOADAPTER_H_  // NOLINT
 #define TALK_MEDIA_BASE_VIDEOADAPTER_H_
 
-#include "talk/base/common.h"  // For ASSERT
-#include "talk/base/criticalsection.h"
-#include "talk/base/scoped_ptr.h"
-#include "talk/base/sigslot.h"
+#include "webrtc/base/common.h"  // For ASSERT
+#include "webrtc/base/criticalsection.h"
+#include "webrtc/base/scoped_ptr.h"
+#include "webrtc/base/sigslot.h"
 #include "talk/media/base/videocommon.h"
 
 namespace cricket {
@@ -99,9 +99,9 @@
   bool black_output_;  // Flag to tell if we need to black output_frame_.
   bool is_black_;  // Flag to tell if output_frame_ is currently black.
   int64 interval_next_frame_;
-  talk_base::scoped_ptr<VideoFrame> output_frame_;
+  rtc::scoped_ptr<VideoFrame> output_frame_;
   // The critical section to protect the above variables.
-  talk_base::CriticalSection critical_section_;
+  rtc::CriticalSection critical_section_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoAdapter);
 };
@@ -206,7 +206,7 @@
   int cpu_desired_num_pixels_;
   CoordinatedVideoAdapter::AdaptReason adapt_reason_;
   // The critical section to protect handling requests.
-  talk_base::CriticalSection request_critical_section_;
+  rtc::CriticalSection request_critical_section_;
 
   // The weighted average of cpu load over time. It's always updated (if cpu
   // adaptation is on), but only used if cpu_smoothing_ is set.