Commit 78074d5d authored Dec 06, 2011 by James Dong Committed by Android Git Automerger Dec 06, 2011

am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when...

am 6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1

* commit '6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
  DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames

parents 4a511081 e74de52d

media/libstagefright/SampleTable.cpp

+8 −0

Original line number	Diff line number	Diff line
		@@ -627,6 +627,14 @@ status_t SampleTable::findSyncSampleNear(

		++left;
		}

		if (left == mNumSyncSamples) {
		if (flags == kFlagAfter) {
		LOGE("tried to find a sync frame after the last one: %d", left);
		return ERROR_OUT_OF_RANGE;
		}
		}

		if (left > 0) {
		--left;
		}