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>
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user