commit d4e598d57aed714a599444a7eab5e8fdde52a950
author buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jul 29 17:36:52 2014
committer buildbot@webrtc.org <buildbot@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jul 29 17:36:52 2014
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/fakevideorenderer.h

diff --git a/talk/media/base/fakevideorenderer.h b/talk/media/base/fakevideorenderer.h
index cab77dd..f32fad5 100644
--- a/talk/media/base/fakevideorenderer.h
+++ b/talk/media/base/fakevideorenderer.h
@@ -28,8 +28,8 @@
 #ifndef TALK_MEDIA_BASE_FAKEVIDEORENDERER_H_
 #define TALK_MEDIA_BASE_FAKEVIDEORENDERER_H_
 
-#include "talk/base/logging.h"
-#include "talk/base/sigslot.h"
+#include "webrtc/base/logging.h"
+#include "webrtc/base/sigslot.h"
 #include "talk/media/base/videoframe.h"
 #include "talk/media/base/videorenderer.h"
 
@@ -48,7 +48,7 @@
   }
 
   virtual bool SetSize(int width, int height, int reserved) {
-    talk_base::CritScope cs(&crit_);
+    rtc::CritScope cs(&crit_);
     width_ = width;
     height_ = height;
     ++num_set_sizes_;
@@ -57,7 +57,7 @@
   }
 
   virtual bool RenderFrame(const VideoFrame* frame) {
-    talk_base::CritScope cs(&crit_);
+    rtc::CritScope cs(&crit_);
     // TODO(zhurunz) Check with VP8 team to see if we can remove this
     // tolerance on Y values.
     black_frame_ = CheckFrameColorYuv(6, 48, 128, 128, 128, 128, frame);
@@ -82,23 +82,23 @@
 
   int errors() const { return errors_; }
   int width() const {
-    talk_base::CritScope cs(&crit_);
+    rtc::CritScope cs(&crit_);
     return width_;
   }
   int height() const {
-    talk_base::CritScope cs(&crit_);
+    rtc::CritScope cs(&crit_);
     return height_;
   }
   int num_set_sizes() const {
-    talk_base::CritScope cs(&crit_);
+    rtc::CritScope cs(&crit_);
     return num_set_sizes_;
   }
   int num_rendered_frames() const {
-    talk_base::CritScope cs(&crit_);
+    rtc::CritScope cs(&crit_);
     return num_rendered_frames_;
   }
   bool black_frame() const {
-    talk_base::CritScope cs(&crit_);
+    rtc::CritScope cs(&crit_);
     return black_frame_;
   }
 
@@ -160,7 +160,7 @@
   int num_set_sizes_;
   int num_rendered_frames_;
   bool black_frame_;
-  mutable talk_base::CriticalSection crit_;
+  mutable rtc::CriticalSection crit_;
 };
 
 }  // namespace cricket