| Index: webrtc/media/devices/carbonvideorenderer.h
|
| diff --git a/talk/media/devices/carbonvideorenderer.h b/webrtc/media/devices/carbonvideorenderer.h
|
| similarity index 92%
|
| rename from talk/media/devices/carbonvideorenderer.h
|
| rename to webrtc/media/devices/carbonvideorenderer.h
|
| index e8329ea031667d4082fe8f743436326c2c26057a..7492b61af21b6187236f9fd5bb891b234de1e88b 100644
|
| --- a/talk/media/devices/carbonvideorenderer.h
|
| +++ b/webrtc/media/devices/carbonvideorenderer.h
|
| @@ -28,14 +28,14 @@
|
| // Definition of class CarbonVideoRenderer that implements the abstract class
|
| // cricket::VideoRenderer via Carbon.
|
|
|
| -#ifndef TALK_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
|
| -#define TALK_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
|
| +#ifndef WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
|
| +#define WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
|
|
|
| #include <Carbon/Carbon.h>
|
|
|
| -#include "talk/media/base/videorenderer.h"
|
| #include "webrtc/base/criticalsection.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| +#include "webrtc/media/base/videorenderer.h"
|
|
|
| namespace cricket {
|
|
|
| @@ -70,4 +70,4 @@ class CarbonVideoRenderer : public VideoRenderer {
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
|
| +#endif // WEBRTC_MEDIA_DEVICES_CARBONVIDEORENDERER_H_
|
|
|