From abe095b879ff56bb851aa37ad3746e93500b35bd Mon Sep 17 00:00:00 2001 From: kjellander Date: Wed, 3 Feb 2016 04:26:34 -0800 Subject: [PATCH] Roll chromium_revision c6076f2..609aa24 (372974:373145) Change log: https://chromium.googlesource.com/chromium/src/+log/c6076f2..609aa24 Full diff: https://chromium.googlesource.com/chromium/src/+/c6076f2..609aa24 Changed dependencies: * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/cab2b46..501a5c5 DEPS diff: https://chromium.googlesource.com/chromium/src/+/c6076f2..609aa24/DEPS Clang version changed 257955:259395 Details: https://chromium.googlesource.com/chromium/src/+/c6076f2..609aa24/tools/clang/scripts/update.py NOTRY=True TBR=pbos@webrtc.org Review URL: https://codereview.webrtc.org/1660143004 Cr-Commit-Position: refs/heads/master@{#11471} --- DEPS | 2 +- talk/media/base/videoframe_unittest.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index e164282ec5..d63b72dac2 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'c6076f2213725d472f17191c54ce0e3232a07537', + 'chromium_revision': '609aa24c35cd18909dd5e6a76944d8169c2e0057', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/talk/media/base/videoframe_unittest.h b/talk/media/base/videoframe_unittest.h index 3236066bc3..372a370e54 100644 --- a/talk/media/base/videoframe_unittest.h +++ b/talk/media/base/videoframe_unittest.h @@ -249,7 +249,7 @@ class VideoFrameTest : public testing::Test { } for (uint32_t i = 0; i < width * height * bpp / 8; ++i) { - char value = ((i / 63) & 1) ? 192 : 64; + uint8_t value = ((i / 63) & 1) ? 192 : 64; ms->Write(&value, sizeof(value), NULL, NULL); } return ms.release();