diff options
| author | Marco Nelissen <marcone@google.com> | 2015-01-27 10:04:01 -0800 |
|---|---|---|
| committer | Marco Nelissen <marcone@google.com> | 2015-01-27 10:04:01 -0800 |
| commit | 9391844deb3f6a442745cea62f78aca2cea19e50 (patch) | |
| tree | c8868256f6cbd8e683b45c7fa4e3d56aa26d2574 /media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | |
| parent | b7909adcef247c627fbe8026624b9ecbeba47655 (diff) | |
| parent | b955b7224382b488a4d8d5663c92118feb8deb1e (diff) | |
| download | frameworks_av-9391844deb3f6a442745cea62f78aca2cea19e50.zip frameworks_av-9391844deb3f6a442745cea62f78aca2cea19e50.tar.gz frameworks_av-9391844deb3f6a442745cea62f78aca2cea19e50.tar.bz2 | |
resolved conflicts for merge of b955b722 to lmp-mr1-dev-plus-aosp
Change-Id: I385371869169eee4fe6330ffe0abc5eda4cb4f72
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp index e7e1759..bc79fdb 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayerDriver.cpp @@ -654,8 +654,7 @@ void NuPlayerDriver::notifyListener_l( mAutoLoop = false; } } - if (mLooping || (mAutoLoop - && (mAudioSink == NULL || mAudioSink->realtime()))) { + if (mLooping || mAutoLoop) { mPlayer->seekToAsync(0); if (mAudioSink != NULL) { // The renderer has stopped the sink at the end in order to play out |