Commit 24aeeef2 authored Apr 11, 2017 by Roger1 Jonsson Committed by android-build-merger Apr 11, 2017

Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d1220437...

Merge "Avoid crash for stss sync sample number 0" into lmp-dev am: d1220437 am: 6dfbcefe am: 85f575dc am: c5bea960 am: c510b7fb am: 2f72b158 am: 4f383edd am: 9d31e500 am: 2046d331
am: f0a54b35

Change-Id: I12e012cdfa97ba91a256e41412185bc1276be522

media/libstagefright/SampleTable.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -567,6 +567,10 @@ status_t SampleTable::setSyncSampleParams(off64_t data_offset, size_t data_size)
		}

		for (size_t i = 0; i < numSyncSamples; ++i) {
		if (mSyncSamples[i] == 0) {
		ALOGE("b/32423862, unexpected zero value in stss");
		continue;
		}
		mSyncSamples[i] = ntohl(mSyncSamples[i]) - 1;
		}