diff options
| author | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 21:15:56 +0000 |
|---|---|---|
| committer | deanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-28 21:15:56 +0000 |
| commit | 65d55d8a39fa6d3438b8b14f4b7a5bd961728142 (patch) | |
| tree | 6c7dbb6c681c9221a44b91344c5ceda53db35f4a /media/base | |
| parent | 1c48541e7a183a418dca7f98a42a72723c178f81 (diff) | |
| download | chromium_src-65d55d8a39fa6d3438b8b14f4b7a5bd961728142.zip chromium_src-65d55d8a39fa6d3438b8b14f4b7a5bd961728142.tar.gz chromium_src-65d55d8a39fa6d3438b8b14f4b7a5bd961728142.tar.bz2 | |
Assorted fixes for 64-bit.
Review URL: http://codereview.chromium.org/160288
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21891 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/video_frame_impl.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/base/video_frame_impl.cc b/media/base/video_frame_impl.cc index d132d0c..aabda6c 100644 --- a/media/base/video_frame_impl.cc +++ b/media/base/video_frame_impl.cc @@ -67,7 +67,8 @@ bool VideoFrameImpl::AllocateRGB(size_t bytes_per_pixel) { surface_.data[VideoSurface::kRGBPlane] = new uint8[bytes_per_row * surface_.height]; DCHECK(surface_.data[VideoSurface::kRGBPlane]); - DCHECK(!(reinterpret_cast<int>(surface_.data[VideoSurface::kRGBPlane]) & 7)); + DCHECK(!(reinterpret_cast<intptr_t>( + surface_.data[VideoSurface::kRGBPlane]) & 7)); COMPILE_ASSERT(0 == VideoSurface::kRGBPlane, RGB_data_must_be_index_0); return (NULL != surface_.data[VideoSurface::kRGBPlane]); } |