Skip to content

Commit 49782b8

Browse files
James DongAndroid Git Automerger
authored andcommitted
am 6b8b5a0: 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
2 parents c473829 + 6b8b5a0 commit 49782b8

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

media/libstagefright/SampleTable.cpp

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -627,6 +627,14 @@ status_t SampleTable::findSyncSampleNear(
627627

628628
++left;
629629
}
630+
631+
if (left == mNumSyncSamples) {
632+
if (flags == kFlagAfter) {
633+
LOGE("tried to find a sync frame after the last one: %d", left);
634+
return ERROR_OUT_OF_RANGE;
635+
}
636+
}
637+
630638
if (left > 0) {
631639
--left;
632640
}

0 commit comments

Comments
 (0)