| Index: webrtc/media/webrtc/webrtcvideocapturer.h
|
| diff --git a/talk/media/webrtc/webrtcvideocapturer.h b/webrtc/media/webrtc/webrtcvideocapturer.h
|
| similarity index 94%
|
| rename from talk/media/webrtc/webrtcvideocapturer.h
|
| rename to webrtc/media/webrtc/webrtcvideocapturer.h
|
| index 591e46f6295ee63d775d24b0f237b841c22b5a20..7e48422b56a546d25cd84c5b8193b85149d46cfd 100644
|
| --- a/talk/media/webrtc/webrtcvideocapturer.h
|
| +++ b/webrtc/media/webrtc/webrtcvideocapturer.h
|
| @@ -25,20 +25,20 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef TALK_MEDIA_WEBRTCVIDEOCAPTURER_H_
|
| -#define TALK_MEDIA_WEBRTCVIDEOCAPTURER_H_
|
| +#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
|
| +#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
|
|
|
| #ifdef HAVE_WEBRTC_VIDEO
|
|
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "talk/media/base/videocapturer.h"
|
| -#include "talk/media/webrtc/webrtcvideoframe.h"
|
| #include "webrtc/base/asyncinvoker.h"
|
| #include "webrtc/base/messagehandler.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/common_video/libyuv/include/webrtc_libyuv.h"
|
| +#include "webrtc/media/base/videocapturer.h"
|
| +#include "webrtc/media/webrtc/webrtcvideoframe.h"
|
| #include "webrtc/modules/video_capture/video_capture.h"
|
|
|
| namespace cricket {
|
| @@ -113,4 +113,4 @@ struct WebRtcCapturedFrame : public CapturedFrame {
|
| } // namespace cricket
|
|
|
| #endif // HAVE_WEBRTC_VIDEO
|
| -#endif // TALK_MEDIA_WEBRTCVIDEOCAPTURER_H_
|
| +#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOCAPTURER_H_
|
|
|