diff options
| author | Andreas Huber <andih@google.com> | 2011-11-17 13:20:16 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-17 13:20:16 -0800 |
| commit | 60047ae30cc816e98ddb4b0b48e58c34c3d1f486 (patch) | |
| tree | 6bbd2fd26a30192dd319f1a1ea93cb7ecdd545ed /media/libstagefright/include | |
| parent | 1de4e2e1d7c22a31238e448200cbbe667cd5fa4c (diff) | |
| parent | 7f2bec1f9b8acc105a5779b18ab180dbe59a1b00 (diff) | |
| download | frameworks_av-60047ae30cc816e98ddb4b0b48e58c34c3d1f486.zip frameworks_av-60047ae30cc816e98ddb4b0b48e58c34c3d1f486.tar.gz frameworks_av-60047ae30cc816e98ddb4b0b48e58c34c3d1f486.tar.bz2 | |
am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS notifications on a cache underrun..." into ics-mr1
* commit '624efe45671131903fb5165f6133ba39486092ab':
Make sure not to cancel pending seek/EOS notifications on a cache underrun...
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index c13d6cb..0985f47 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -250,7 +250,7 @@ private: void notifyVideoSize_l(); void seekAudioIfNecessary_l(); - void cancelPlayerEvents(bool keepBufferingGoing = false); + void cancelPlayerEvents(bool keepNotifications = false); void setAudioSource(sp<MediaSource> source); status_t initAudioDecoder(); |