From: Andreas Huber <andih@google.com>
Date: Tue, 29 Nov 2011 23:14:44 +0000 (-0800)
Subject: resolved conflicts for merge of 998a929a to master
X-Git-Tag: android-x86-4.4-r1~1579^2~407
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eca36b5a1759970bc3d0373d72d6fec7c9b7e944;p=android-x86%2Fframeworks-av.git

resolved conflicts for merge of 998a929a to master

Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
---

eca36b5a1759970bc3d0373d72d6fec7c9b7e944
diff --cc media/libmediaplayerservice/nuplayer/NuPlayer.cpp
index 719117588f,ea907c9fec..0059dc841e
--- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp
@@@ -538,9 -541,12 +541,12 @@@ void NuPlayer::finishFlushIfPossible() 
          return;
      }
  
 -    LOGV("both audio and video are flushed now.");
 +    ALOGV("both audio and video are flushed now.");
  
-     mRenderer->signalTimeDiscontinuity();
+     if (mTimeDiscontinuityPending) {
+         mRenderer->signalTimeDiscontinuity();
+         mTimeDiscontinuityPending = false;
+     }
  
      if (mAudioDecoder != NULL) {
          mAudioDecoder->signalResume();