commit e74de52d4e22fc61d41f703672fa8f1215446ab5
author James Dong <jdong@google.com> Tue Dec 06 12:52:52 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Tue Dec 06 12:52:52 2011 -0800
tree ebca213f22bc3adee2b0c9efd3fb0aedef86918b
parent f7b5cdd410cb8fdd46bac5b5098e0f01442bba12
parent 223e70d6bde101349cba04b20ef243730cf84c07

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

media/libstagefright/SampleTable.cpp

diff --git a/media/libstagefright/SampleTable.cpp b/media/libstagefright/SampleTable.cpp
index 69d1785..bf31947 100644
--- a/media/libstagefright/SampleTable.cpp
+++ b/media/libstagefright/SampleTable.cpp
@@ -627,6 +627,14 @@
 
         ++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;
     }