Merge "Guard against sample time overflow"

            }

            ++sampleIndex;

            if (sampleTime > UINT32_MAX - delta) {

                ALOGE("%u + %u would overflow, clamping",

                    sampleTime, delta);

                sampleTime = UINT32_MAX;

            } else {

                sampleTime += delta;

            }

        }

    }

    qsort(mSampleTimeEntries, mNumSampleSizes, sizeof(SampleTimeEntry),

          CompareIncreasingTime);