diff options
| author | pph34r@gmail.com <pph34r@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 19:41:56 +0000 |
|---|---|---|
| committer | pph34r@gmail.com <pph34r@gmail.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-28 19:41:56 +0000 |
| commit | 017cf73d16f76863a7bf8806632b4f32052ac029 (patch) | |
| tree | 516977a1f393d6acf46c025f9712801301a072cc /media | |
| parent | 630ef9097c012093f23db51b8d92b1268233c2e8 (diff) | |
| download | chromium_src-017cf73d16f76863a7bf8806632b4f32052ac029.zip chromium_src-017cf73d16f76863a7bf8806632b4f32052ac029.tar.gz chromium_src-017cf73d16f76863a7bf8806632b4f32052ac029.tar.bz2 | |
GCC 4.6 -Wunused-but-set-variable cleanup.
BUG=87490
TEST=None
Review URL: http://codereview.chromium.org/7230023
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90818 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/yuv_convert.cc | 4 | ||||
| -rw-r--r-- | media/test/ffmpeg_tests/ffmpeg_tests.cc | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/media/base/yuv_convert.cc b/media/base/yuv_convert.cc index b4972083..bf0f2ca 100644 --- a/media/base/yuv_convert.cc +++ b/media/base/yuv_convert.cc @@ -221,7 +221,9 @@ void ScaleYUVToRGB32(const uint8* y_buf, return; int source_dx = source_width * kFractionMax / width; int source_dy = source_height * kFractionMax / height; +#if USE_MMX && defined(_MSC_VER) int source_dx_uv = source_dx; +#endif if ((view_rotate == ROTATE_90) || (view_rotate == ROTATE_270)) { @@ -234,7 +236,9 @@ void ScaleYUVToRGB32(const uint8* y_buf, int original_dx = source_dx; int original_dy = source_dy; source_dx = ((original_dy >> kFractionBits) * y_pitch) << kFractionBits; +#if USE_MMX && defined(_MSC_VER) source_dx_uv = ((original_dy >> kFractionBits) * uv_pitch) << kFractionBits; +#endif source_dy = original_dx; if (view_rotate == ROTATE_90) { y_pitch = -1; diff --git a/media/test/ffmpeg_tests/ffmpeg_tests.cc b/media/test/ffmpeg_tests/ffmpeg_tests.cc index 5745fe9..22e51ef 100644 --- a/media/test/ffmpeg_tests/ffmpeg_tests.cc +++ b/media/test/ffmpeg_tests/ffmpeg_tests.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -405,7 +405,9 @@ int main(int argc, const char** argv) { if (max_frames && (frames >= max_frames)) break; } while (read_result >= 0); +#if SHOW_VERBOSE base::TimeDelta total = base::TimeTicks::HighResNow() - start; +#endif LeaveTimingSection(); // Clean up. |