| Index: webrtc/common_video/include/video_frame.h
|
| diff --git a/webrtc/video_frame.h b/webrtc/common_video/include/video_frame.h
|
| similarity index 84%
|
| copy from webrtc/video_frame.h
|
| copy to webrtc/common_video/include/video_frame.h
|
| index 93cc1713679c4084638874b62a194780ada6f383..1e8f37c171c7cf4bdb850d7665d4c084a69155d3 100644
|
| --- a/webrtc/video_frame.h
|
| +++ b/webrtc/common_video/include/video_frame.h
|
| @@ -8,14 +8,13 @@
|
| * be found in the AUTHORS file in the root of the source tree.
|
| */
|
|
|
| -#ifndef WEBRTC_VIDEO_FRAME_H_
|
| -#define WEBRTC_VIDEO_FRAME_H_
|
| +#ifndef WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_
|
| +#define WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_
|
|
|
| -// TODO(nisse): This header file should eventually be deleted. For
|
| -// declarations of classes related to unencoded video frame, use the
|
| -// headers under api/video instead. The EncodedImage class stays in
|
| -// this file until we have figured out how to refactor and clean up
|
| -// related interfaces.
|
| +// TODO(nisse): This header file should eventually be deleted. The
|
| +// EncodedImage class stays in this file until we have figured out how
|
| +// to refactor and clean up related interfaces, at which point it
|
| +// should be moved to somewhere under api/.
|
|
|
| #include "webrtc/common_types.h"
|
| #include "webrtc/typedefs.h"
|
| @@ -67,4 +66,5 @@ class EncodedImage {
|
| };
|
|
|
| } // namespace webrtc
|
| -#endif // WEBRTC_VIDEO_FRAME_H_
|
| +
|
| +#endif // WEBRTC_COMMON_VIDEO_INCLUDE_VIDEO_FRAME_H_
|
|
|