Index: media/base/android/media_player_bridge.cc |
diff --git a/media/base/android/media_player_bridge.cc b/media/base/android/media_player_bridge.cc |
index 432042ed25ac2b8c9ceeee3865f3c199eaf9e678..0096d6837ed498b7b87faedb280be2244382e658 100644 |
--- a/media/base/android/media_player_bridge.cc |
+++ b/media/base/android/media_player_bridge.cc |
@@ -17,6 +17,7 @@ |
#include "media/base/android/media_url_interceptor.h" |
#include "media/base/buffers.h" |
+ |
aberent
2014/10/20 14:55:55
Why the extra blank line?
dgn
2014/10/20 15:43:20
Done.
|
using base::android::ConvertUTF8ToJavaString; |
using base::android::ScopedJavaLocalRef; |
@@ -417,7 +418,9 @@ void MediaPlayerBridge::OnMediaPrepared() { |
// If media player was recovered from a saved state, consume all the pending |
// events. |
- PendingSeekInternal(pending_seek_); |
+ if (pending_seek_.InMilliseconds() >= 0) { // Initialized at -1 |
+ PendingSeekInternal(pending_seek_); |
+ } |
if (pending_play_) { |
StartInternal(); |