diff options
| author | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 23:52:12 +0000 |
|---|---|---|
| committer | alexeypa@chromium.org <alexeypa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 23:52:12 +0000 |
| commit | d9f27887b0b567b9d21de07d5d531ae9d0157228 (patch) | |
| tree | 9eece8ca5a28b0f78937f1800bae5722c7640fce /media/base | |
| parent | 9400ff8c479f8223514cdaa1ae715428e984735f (diff) | |
| download | chromium_src-d9f27887b0b567b9d21de07d5d531ae9d0157228.zip chromium_src-d9f27887b0b567b9d21de07d5d531ae9d0157228.tar.gz chromium_src-d9f27887b0b567b9d21de07d5d531ae9d0157228.tar.bz2 | |
Reverting 120739 that caused valgrind breaks.
BUG=109938
Review URL: http://codereview.chromium.org/9352017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120866 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/yuv_convert.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc index ed9bed4..8d5073b 100644 --- a/media/base/yuv_convert.cc +++ b/media/base/yuv_convert.cc @@ -335,9 +335,8 @@ void ScaleYUVToRGB32WithRect(const uint8* y_buf, // Determine the parts of the Y, U and V buffers to interpolate. int source_y_left = source_left >> kFractionBits; - int source_y_right = std::min( - (source_right >> kFractionBits) + 2, - source_width + 1); + int source_y_right = (source_right >> kFractionBits) + 2; + DCHECK(source_y_right <= source_width); int source_uv_left = source_y_left / 2; int source_uv_right = std::min( |