| Index: webrtc/media/base/hybriddataengine.h
|
| diff --git a/talk/media/base/hybriddataengine.h b/webrtc/media/base/hybriddataengine.h
|
| similarity index 89%
|
| rename from talk/media/base/hybriddataengine.h
|
| rename to webrtc/media/base/hybriddataengine.h
|
| index cbdfa8a0076321fd850c05bc8e68d03595a93814..a5b09a12ad85afba0391f411ffccdd37c0a3aee0 100644
|
| --- a/talk/media/base/hybriddataengine.h
|
| +++ b/webrtc/media/base/hybriddataengine.h
|
| @@ -1,6 +1,6 @@
|
| /*
|
| * libjingle
|
| - * Copyright 2012 Google Inc. and Robin Seggelmann
|
| + * Copyright 2012 Google Inc.
|
| *
|
| * Redistribution and use in source and binary forms, with or without
|
| * modification, are permitted provided that the following conditions are met:
|
| @@ -25,16 +25,16 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef TALK_MEDIA_SCTP_HYBRIDDATAENGINE_H_
|
| -#define TALK_MEDIA_SCTP_HYBRIDDATAENGINE_H_
|
| +#ifndef WEBRTC_MEDIA_BASE_HYBRIDDATAENGINE_H_
|
| +#define WEBRTC_MEDIA_BASE_HYBRIDDATAENGINE_H_
|
|
|
| #include <string>
|
| #include <vector>
|
|
|
| -#include "talk/media/base/codec.h"
|
| -#include "talk/media/base/mediachannel.h"
|
| -#include "talk/media/base/mediaengine.h"
|
| #include "webrtc/base/scoped_ptr.h"
|
| +#include "webrtc/media/base/codec.h"
|
| +#include "webrtc/media/base/mediachannel.h"
|
| +#include "webrtc/media/base/mediaengine.h"
|
|
|
| namespace cricket {
|
|
|
| @@ -73,4 +73,4 @@ class HybridDataEngine : public DataEngineInterface {
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_SCTP_HYBRIDDATAENGINE_H_
|
| +#endif // WEBRTC_MEDIA_BASE_HYBRIDDATAENGINE_H_
|
|
|