| Index: webrtc/media/webrtc/webrtcvideoframe.h
|
| diff --git a/talk/media/webrtc/webrtcvideoframe.h b/webrtc/media/webrtc/webrtcvideoframe.h
|
| similarity index 96%
|
| rename from talk/media/webrtc/webrtcvideoframe.h
|
| rename to webrtc/media/webrtc/webrtcvideoframe.h
|
| index 33d28738749b16c1bf92c802ad08c6c3ac5e3015..319f9c79ad87c765356a108425f525ef64ffbafe 100644
|
| --- a/talk/media/webrtc/webrtcvideoframe.h
|
| +++ b/webrtc/media/webrtc/webrtcvideoframe.h
|
| @@ -25,15 +25,15 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef TALK_MEDIA_WEBRTCVIDEOFRAME_H_
|
| -#define TALK_MEDIA_WEBRTCVIDEOFRAME_H_
|
| +#ifndef WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_
|
| +#define WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_
|
|
|
| -#include "talk/media/base/videoframe.h"
|
| #include "webrtc/base/buffer.h"
|
| #include "webrtc/base/refcount.h"
|
| #include "webrtc/base/scoped_ref_ptr.h"
|
| #include "webrtc/common_types.h"
|
| #include "webrtc/common_video/include/video_frame_buffer.h"
|
| +#include "webrtc/media/base/videoframe.h"
|
|
|
| namespace cricket {
|
|
|
| @@ -135,4 +135,4 @@ class WebRtcVideoFrame : public VideoFrame {
|
|
|
| } // namespace cricket
|
|
|
| -#endif // TALK_MEDIA_WEBRTCVIDEOFRAME_H_
|
| +#endif // WEBRTC_MEDIA_WEBRTC_WEBRTCVIDEOFRAME_H_
|
|
|