Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe34006d authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru Committed by Android Git Automerger
Browse files

am 05cd296e: Merge "libmedia: Fix build with gcc 4.7" 

* commit '05cd296e':
  libmedia: Fix build with gcc 4.7
parents cb57f4f6 05cd296e

media/libmedia/MediaProfiles.cpp

+3 −3
Original line number Diff line number Diff line
@@ -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