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/libstagefright/AwesomePlayer.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/libstagefright/AwesomePlayer.cpp')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index 007c090..87eef1e 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -889,10 +889,7 @@ void AwesomePlayer::onStreamDone() { } } if ((mFlags & LOOPING) - || ((mFlags & AUTO_LOOPING) - && (mAudioSink == NULL || mAudioSink->realtime()))) { - // Don't AUTO_LOOP if we're being recorded, since that cannot be - // turned off and recording would go on indefinitely. + || (mFlags & AUTO_LOOPING)) { seekTo_l(0); |