| Index: webrtc/media/base/capturerenderadapter.h
|
| diff --git a/talk/media/base/capturerenderadapter.h b/webrtc/media/base/capturerenderadapter.h
|
| similarity index 93%
|
| rename from talk/media/base/capturerenderadapter.h
|
| rename to webrtc/media/base/capturerenderadapter.h
|
| index f972c983c5d85b3862ad1e7dd82e6cc01b56a048..ed139890dc1ff203eabb71e0516fbd9aabf07f4b 100644
|
| --- a/talk/media/base/capturerenderadapter.h
|
| +++ b/webrtc/media/base/capturerenderadapter.h
|
| @@ -31,14 +31,14 @@
|
| // CaptureRenderAdapter is Thread-unsafe. This means that none of its APIs may
|
| // be called concurrently.
|
|
|
| -#ifndef TALK_MEDIA_BASE_CAPTURERENDERADAPTER_H_
|
| -#define TALK_MEDIA_BASE_CAPTURERENDERADAPTER_H_
|
| +#ifndef WEBRTC_MEDIA_BASE_CAPTURERENDERADAPTER_H_
|
| +#define WEBRTC_MEDIA_BASE_CAPTURERENDERADAPTER_H_
|
|
|
| #include <vector>
|
|
|
| -#include "talk/media/base/videocapturer.h"
|
| #include "webrtc/base/criticalsection.h"
|
| #include "webrtc/base/sigslot.h"
|
| +#include "webrtc/media/base/videocapturer.h"
|
| #include "webrtc/media/base/videosinkinterface.h"
|
|
|
| namespace cricket {
|
| @@ -72,4 +72,4 @@ class CaptureRenderAdapter : public sigslot::has_slots<> {
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_BASE_CAPTURERENDERADAPTER_H_
|
| +#endif // WEBRTC_MEDIA_BASE_CAPTURERENDERADAPTER_H_
|
|
|