summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2010-04-12 11:05:09 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-04-12 11:05:09 -0700
commit4501f62d7acb2fc754b89e77e4cec2e6c5b46037 (patch)
treec93634d671c6a7d0ada06023558fce8055484b78 /include
parenta7f57ef707077a005a65b025bebda2a5459d81bd (diff)
parente2018ca9ff9234876bb5ba63d2f51b72396c5fca (diff)
downloadframeworks_base-4501f62d7acb2fc754b89e77e4cec2e6c5b46037.zip
frameworks_base-4501f62d7acb2fc754b89e77e4cec2e6c5b46037.tar.gz
frameworks_base-4501f62d7acb2fc754b89e77e4cec2e6c5b46037.tar.bz2
Merge "Remove unnecessary lock from AMRWriter." into kraken
Diffstat (limited to 'include')
-rw-r--r--include/media/stagefright/AMRWriter.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/include/media/stagefright/AMRWriter.h b/include/media/stagefright/AMRWriter.h
index 372909a..34f3c4a 100644
--- a/include/media/stagefright/AMRWriter.h
+++ b/include/media/stagefright/AMRWriter.h
@@ -42,14 +42,12 @@ protected:
virtual ~AMRWriter();
private:
- Mutex mLock;
-
FILE *mFile;
status_t mInitCheck;
sp<MediaSource> mSource;
bool mStarted;
volatile bool mDone;
- bool mReachedEOS;
+ volatile bool mReachedEOS;
pthread_t mThread;
static void *ThreadWrapper(void *);