summaryrefslogtreecommitdiff
path: root/media/base/yuv_convert_unittest.cc
diff options
context:
space:
mode:
authorTorne (Richard Coles) <torne@google.com>2013-05-29 14:40:03 +0100
committerTorne (Richard Coles) <torne@google.com>2013-05-29 14:40:03 +0100
commit90dce4d38c5ff5333bea97d859d4e484e27edf0c (patch)
tree9c51c7dd97d24b15befa97a3482c51851e5383a1 /media/base/yuv_convert_unittest.cc
parent1515035f5917d10d363b0888a3615d581ad8b83f (diff)
downloadchromium_org-90dce4d38c5ff5333bea97d859d4e484e27edf0c.tar.gz
Merge from Chromium at DEPS revision r202854
This commit was generated by merge_to_master.py. Change-Id: Idca323f71ef844a9e04f454d4f070b1e398f2deb
Diffstat (limited to 'media/base/yuv_convert_unittest.cc')
-rw-r--r--media/base/yuv_convert_unittest.cc4
1 files changed, 4 insertions, 0 deletions
diff --git a/media/base/yuv_convert_unittest.cc b/media/base/yuv_convert_unittest.cc
index 1fbceb9e09..1ac2a2d17c 100644
--- a/media/base/yuv_convert_unittest.cc
+++ b/media/base/yuv_convert_unittest.cc
@@ -76,6 +76,8 @@ static void ReadYUY2Data(scoped_ptr<uint8[]>* data) {
ReadData(FILE_PATH_LITERAL("bali_640x360_YUY2.yuv"), kYUY2Size, data);
}
+namespace media {
+
TEST(YUVConvertTest, YV12) {
// Allocate all surfaces.
scoped_ptr<uint8[]> yuv_bytes;
@@ -939,3 +941,5 @@ TEST(YUVConvertTest, LinearScaleYUVToRGB32Row_MMX_X64) {
#endif // defined(ARCH_CPU_X86_64)
#endif // defined(ARCH_CPU_X86_FAMILY)
+
+} // namespace media