diff options
author | Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> | 2012-03-29 11:38:59 +0200 |
---|---|---|
committer | Jean-Baptiste Queru <jbq@google.com> | 2012-05-24 06:48:23 -0700 |
commit | 3c8889e827d95b195fe5ba077a01cb5b6042e534 (patch) | |
tree | 21f0fb2ccaa4a7643733d3f80e1443d62f44a447 /media/libmedia/MediaProfiles.cpp | |
parent | cba7b32d8f2c47632313f54118ed3733b4b02cc8 (diff) |
libmedia: Fix build with gcc 4.7
gcc 4.7 doesn't like the redefinition of n in the same
scope:
for(size_t n=...;;) {
size_t n = 2; // <-- duplicate definition
}
Change-Id: Idfc2e768a0eb85a3dacccd3431b4ad44775432a4
Signed-off-by: Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org>
Diffstat (limited to 'media/libmedia/MediaProfiles.cpp')
-rw-r--r-- | media/libmedia/MediaProfiles.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp index 6929efa2..84bc7a72 100644 --- a/media/libmedia/MediaProfiles.cpp +++ b/media/libmedia/MediaProfiles.cpp @@ -516,16 +516,16 @@ void MediaProfiles::checkAndAddRequiredProfilesIfNecessary() { // Check high and low from either camcorder profile or timelapse profile // but not both. Default, check camcorder profile size_t j = 0; - size_t n = 2; + size_t o = 2; if (isTimelapseProfile(quality)) { // Check timelapse profile instead. j = 2; - n = kNumRequiredProfiles; + o = kNumRequiredProfiles; } else { // Must be camcorder profile. CHECK(isCamcorderProfile(quality)); } - for (; j < n; ++j) { + for (; j < o; ++j) { info = &(mRequiredProfileRefs[refIndex].mRefs[j]); if ((j % 2 == 0 && product > info->mResolutionProduct) || // low (j % 2 != 0 && product < info->mResolutionProduct)) { // high |