commit a238b9b43a2b8dac60e0fd8700daa6cd4f644547
author Marco Nelissen <marcone@google.com> Wed Jan 15 22:26:06 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Jan 15 22:26:06 2014 +0000
tree 7b3de67dfb786341e7d8e7518edf9616cbb56737
parent b1c8d9fbc69e2f103699d24a81c2406e52a94c9f
parent 07634f1f8f8a899eefba978945b482dd15dabdb8

am 07634f1f: am cbf9e91a: am 1e8a57c2: Merge "Avoid jumps to faulty position after seeks"

* commit '07634f1f8f8a899eefba978945b482dd15dabdb8':
  Avoid jumps to faulty position after seeks

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 130207d..aae6800 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -2096,7 +2096,10 @@
             mSeekNotificationSent = true;
         }
 
-        mSeeking = NO_SEEK;
+        if (mVideoSource == NULL) {
+            // For video the mSeeking flag is always reset in finishSeekIfNecessary
+            mSeeking = NO_SEEK;
+        }
 
         notifyIfMediaStarted_l();
     }