diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-03 23:35:37 +0000 |
|---|---|---|
| committer | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-11-03 23:35:37 +0000 |
| commit | 2a4d9df8c969213f1942ea9f116293adbf41e2d3 (patch) | |
| tree | ce8e8abdda03b1ed087b1bbfa88032159991af6a /media/libmediaplayerservice/nuplayer/GenericSource.h | |
| parent | bdf2ad577d53139ec69e44b9cc8b8b90f8be330b (diff) | |
| parent | 02103bb21c90abdca4e4ba91f7e3e007a82e01fd (diff) | |
| download | frameworks_av-2a4d9df8c969213f1942ea9f116293adbf41e2d3.zip frameworks_av-2a4d9df8c969213f1942ea9f116293adbf41e2d3.tar.gz frameworks_av-2a4d9df8c969213f1942ea9f116293adbf41e2d3.tar.bz2 | |
Merge tag 'android-6.0.0_r5' into HEAD
Android 6.0.0 release 5
Conflicts:
media/libstagefright/OggExtractor.cpp
media/libstagefright/Utils.cpp
Change-Id: I2ea44836c5cc3da8ffa2092522293c433bf7538c
Diffstat (limited to 'media/libmediaplayerservice/nuplayer/GenericSource.h')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.h b/media/libmediaplayerservice/nuplayer/GenericSource.h index 0181947..d7467c2 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.h +++ b/media/libmediaplayerservice/nuplayer/GenericSource.h @@ -153,6 +153,7 @@ protected: int32_t mPrevBufferPercentage; mutable Mutex mReadBufferLock; + mutable Mutex mDisconnectLock; sp<ALooper> mLooper; |