commit c6a957fca84ee2a673a3b7363b481afcf4b7e784
author Marco Nelissen <marcone@google.com> Tue Jun 12 12:44:45 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Jun 12 12:44:45 2012 -0700
tree f25fa64509518b3a4bd126dddbe17064a25dd634
parent b8d07d4b8dce11cfb293e4b0f2232ec860e9ccd5
parent b7706712938c55706c87724af7f6d2f2156b8d1b

am b7706712: Merge "Fix gapless for deep buffers" into jb-dev

* commit 'b7706712938c55706c87724af7f6d2f2156b8d1b':
  Fix gapless for deep buffers

media/libmediaplayerservice/MediaPlayerService.cpp

diff --git a/media/libmediaplayerservice/MediaPlayerService.cpp b/media/libmediaplayerservice/MediaPlayerService.cpp
index 4bf2d3f..c47fbd6 100644
--- a/media/libmediaplayerservice/MediaPlayerService.cpp
+++ b/media/libmediaplayerservice/MediaPlayerService.cpp
@@ -1679,6 +1679,7 @@
         mNextOutput->mSampleRateHz = mSampleRateHz;
         mNextOutput->mMsecsPerFrame = mMsecsPerFrame;
         mNextOutput->mBytesWritten = mBytesWritten;
+        mNextOutput->mFlags = mFlags;
     }
 }