summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> 2012-03-29 11:38:59 +0200
committer Bernhard Rosenkraenzer <Bernhard.Rosenkranzer@linaro.org> 2012-03-29 11:38:59 +0200
commit0bd12c1f86e44ab2deebd543bb830eae92d4eaa4 (patch)
treecdf8f3fd10f046318b2073313b97eefaa093cb35
parent8ea93aa6adc0e46c8931d31d4f940cdde97c672f (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>
-rw-r--r--media/libmedia/MediaProfiles.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/media/libmedia/MediaProfiles.cpp b/media/libmedia/MediaProfiles.cpp
index c905762799e6..d02ac1a80e50 100644
--- a/media/libmedia/MediaProfiles.cpp
+++ b/media/libmedia/MediaProfiles.cpp
@@ -514,16 +514,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