| Index: webrtc/media/base/videoadapter.h
|
| diff --git a/talk/media/base/videoadapter.h b/webrtc/media/base/videoadapter.h
|
| similarity index 97%
|
| rename from talk/media/base/videoadapter.h
|
| rename to webrtc/media/base/videoadapter.h
|
| index 212f250cf321b886e5476e43646c30756f5612d1..cf9a3d10b921bbe2f6608e08f325525198a458cc 100644
|
| --- a/talk/media/base/videoadapter.h
|
| +++ b/webrtc/media/base/videoadapter.h
|
| @@ -25,14 +25,14 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef TALK_MEDIA_BASE_VIDEOADAPTER_H_ // NOLINT
|
| -#define TALK_MEDIA_BASE_VIDEOADAPTER_H_
|
| +#ifndef WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_ // NOLINT
|
| +#define WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_
|
|
|
| -#include "talk/media/base/videocommon.h"
|
| #include "webrtc/base/common.h" // For ASSERT
|
| #include "webrtc/base/criticalsection.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| #include "webrtc/base/sigslot.h"
|
| +#include "webrtc/media/base/videocommon.h"
|
|
|
| namespace cricket {
|
|
|
| @@ -206,4 +206,4 @@ class CoordinatedVideoAdapter
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_BASE_VIDEOADAPTER_H_ // NOLINT
|
| +#endif // WEBRTC_MEDIA_BASE_VIDEOADAPTER_H_ // NOLINT
|
|
|