diff options
| author | Marco Nelissen <marcone@google.com> | 2013-09-30 17:10:21 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-30 17:10:21 -0700 |
| commit | d990e7b27b1984fcaee6c37005056db9ca5ca3c7 (patch) | |
| tree | e0bacdb7c6dc921def7e69be3c0fb7521679eb05 /media/libstagefright/include | |
| parent | 934d140fb9993a36db5759c0dab08ff991894249 (diff) | |
| parent | 3d97e23fcd78f752443cb6c30a1ee39f49f1f987 (diff) | |
| download | frameworks_av-d990e7b27b1984fcaee6c37005056db9ca5ca3c7.zip frameworks_av-d990e7b27b1984fcaee6c37005056db9ca5ca3c7.tar.gz frameworks_av-d990e7b27b1984fcaee6c37005056db9ca5ca3c7.tar.bz2 | |
am 3d97e23f: Merge "Prevent onPrepared callback from being called twice" into klp-dev
* commit '3d97e23fcd78f752443cb6c30a1ee39f49f1f987':
Prevent onPrepared callback from being called twice
Diffstat (limited to 'media/libstagefright/include')
| -rw-r--r-- | media/libstagefright/include/AwesomePlayer.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libstagefright/include/AwesomePlayer.h b/media/libstagefright/include/AwesomePlayer.h index b001cf4..271df8e 100644 --- a/media/libstagefright/include/AwesomePlayer.h +++ b/media/libstagefright/include/AwesomePlayer.h @@ -342,6 +342,8 @@ private: bool mOffloadAudio; bool mAudioTearDown; + bool mAudioTearDownWasPlaying; + int64_t mAudioTearDownPosition; status_t setVideoScalingMode(int32_t mode); status_t setVideoScalingMode_l(int32_t mode); |