From c37c602c30b1b2282c3a27ac767e0ecc651335dc Mon Sep 17 00:00:00 2001
From: Kilik Kuo <kikuo@mozilla.com>
Date: Thu, 2 Apr 2015 16:19:23 +0800
Subject: [PATCH] Bug 1146304 - Touch slider bar or tap forward button, the
 video got stuck 1s then resume playing. r=cpearce, a=bajaj

---
 content/media/MediaDecoderStateMachine.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/content/media/MediaDecoderStateMachine.cpp b/content/media/MediaDecoderStateMachine.cpp
index feb1b461a04f..3f8ebf133ffe 100644
--- a/content/media/MediaDecoderStateMachine.cpp
+++ b/content/media/MediaDecoderStateMachine.cpp
@@ -2260,8 +2260,7 @@ MediaDecoderStateMachine::SeekCompleted()
     // seekTime is bounded in suitable duration. See Bug 1112438.
     int64_t videoStart = video ? video->mTime : seekTime;
     int64_t audioStart = audio ? audio->mTime : seekTime;
-    newCurrentTime = mAudioStartTime =
-        std::min(std::min(audioStart, videoStart), seekTime);
+    newCurrentTime = mAudioStartTime = std::min(audioStart, videoStart);
   } else {
     newCurrentTime = video ? video->mTime : seekTime;
   }
-- 
2.11.4.GIT