| Index: webrtc/media/base/videocapturer.h
|
| diff --git a/talk/media/base/videocapturer.h b/webrtc/media/base/videocapturer.h
|
| similarity index 97%
|
| rename from talk/media/base/videocapturer.h
|
| rename to webrtc/media/base/videocapturer.h
|
| index a13c201b8b308d0008d3448e87141ae2640599bd..1091cf87f630bc848bb04d5f0838df97f34e3045 100644
|
| --- a/talk/media/base/videocapturer.h
|
| +++ b/webrtc/media/base/videocapturer.h
|
| @@ -27,18 +27,13 @@
|
|
|
| // Declaration of abstract class VideoCapturer
|
|
|
| -#ifndef TALK_MEDIA_BASE_VIDEOCAPTURER_H_
|
| -#define TALK_MEDIA_BASE_VIDEOCAPTURER_H_
|
| +#ifndef WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
|
| +#define WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
|
|
|
| #include <algorithm>
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "talk/media/base/mediachannel.h"
|
| -#include "talk/media/base/videoadapter.h"
|
| -#include "talk/media/base/videocommon.h"
|
| -#include "talk/media/base/videoframefactory.h"
|
| -#include "talk/media/devices/devicemanager.h"
|
| #include "webrtc/base/basictypes.h"
|
| #include "webrtc/base/criticalsection.h"
|
| #include "webrtc/base/messagehandler.h"
|
| @@ -47,6 +42,11 @@
|
| #include "webrtc/base/sigslot.h"
|
| #include "webrtc/base/thread.h"
|
| #include "webrtc/base/timing.h"
|
| +#include "webrtc/media/base/mediachannel.h"
|
| +#include "webrtc/media/base/videoadapter.h"
|
| +#include "webrtc/media/base/videocommon.h"
|
| +#include "webrtc/media/base/videoframefactory.h"
|
| +#include "webrtc/media/devices/devicemanager.h"
|
|
|
|
|
| namespace cricket {
|
| @@ -382,4 +382,4 @@ class VideoCapturer
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_BASE_VIDEOCAPTURER_H_
|
| +#endif // WEBRTC_MEDIA_BASE_VIDEOCAPTURER_H_
|
|
|