| Index: webrtc/media/base/videoframe_unittest.h
|
| diff --git a/talk/media/base/videoframe_unittest.h b/webrtc/media/base/videoframe_unittest.h
|
| similarity index 99%
|
| rename from talk/media/base/videoframe_unittest.h
|
| rename to webrtc/media/base/videoframe_unittest.h
|
| index 372a370e540c7f6f3ef17cf95103924009a51d8f..0b6faaf17567bcbb790e15aeb6ca204b4cf5c779 100644
|
| --- a/talk/media/base/videoframe_unittest.h
|
| +++ b/webrtc/media/base/videoframe_unittest.h
|
| @@ -25,8 +25,8 @@
|
| * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
| */
|
|
|
| -#ifndef TALK_MEDIA_BASE_VIDEOFRAME_UNITTEST_H_
|
| -#define TALK_MEDIA_BASE_VIDEOFRAME_UNITTEST_H_
|
| +#ifndef WEBRTC_MEDIA_BASE_VIDEOFRAME_UNITTEST_H_
|
| +#define WEBRTC_MEDIA_BASE_VIDEOFRAME_UNITTEST_H_
|
|
|
| #include <algorithm>
|
| #include <string>
|
| @@ -35,14 +35,14 @@
|
| #include "libyuv/convert_from.h"
|
| #include "libyuv/planar_functions.h"
|
| #include "libyuv/rotate.h"
|
| -#include "talk/media/base/testutils.h"
|
| -#include "talk/media/base/videocommon.h"
|
| -#include "talk/media/base/videoframe.h"
|
| #include "webrtc/base/gunit.h"
|
| #include "webrtc/base/pathutils.h"
|
| #include "webrtc/base/stream.h"
|
| #include "webrtc/base/stringutils.h"
|
| #include "webrtc/common_video/rotation.h"
|
| +#include "webrtc/media/base/testutils.h"
|
| +#include "webrtc/media/base/videocommon.h"
|
| +#include "webrtc/media/base/videoframe.h"
|
|
|
| #if defined(_MSC_VER)
|
| #define ALIGN16(var) __declspec(align(16)) var
|
| @@ -1946,4 +1946,4 @@ class VideoFrameTest : public testing::Test {
|
| int repeat_;
|
| };
|
|
|
| -#endif // TALK_MEDIA_BASE_VIDEOFRAME_UNITTEST_H_
|
| +#endif // WEBRTC_MEDIA_BASE_VIDEOFRAME_UNITTEST_H_
|
|
|