Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searc…

…hing for sync frames" into ics-mr1
kelwin · Dec 6, 2011 · 6b8b5a0 · 6b8b5a0
2 parents 05d6306 + cb06491
commit 6b8b5a0
Showing 1 changed file with 8 additions and 0 deletions.
diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
@@ -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;
     }