diff options
| author | James Dong <jdong@google.com> | 2010-08-12 09:32:18 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-12 09:32:18 -0700 |
| commit | 2dac90da3ea5120b52844a6ee38c300301de5756 (patch) | |
| tree | e1f63e3ee3b057b935a9be9ebb4aaf985688821a /media/libmediaplayerservice | |
| parent | 047be32ec88dd04a9aca23fa59773fe2eaccb8f8 (diff) | |
| parent | debd76c4a934c98a88850f0a50a30d3f01394eb7 (diff) | |
| download | frameworks_av-2dac90da3ea5120b52844a6ee38c300301de5756.zip frameworks_av-2dac90da3ea5120b52844a6ee38c300301de5756.tar.gz frameworks_av-2dac90da3ea5120b52844a6ee38c300301de5756.tar.bz2 | |
am 0386d04b: am 581581fe: Merge "Fix all fd leaks in authoring engine" into gingerbread
Merge commit '0386d04b19619b03b6bce830010e11d31d3f8a5c'
* commit '0386d04b19619b03b6bce830010e11d31d3f8a5c':
Fix all fd leaks in authoring engine
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/StagefrightRecorder.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/libmediaplayerservice/StagefrightRecorder.cpp b/media/libmediaplayerservice/StagefrightRecorder.cpp index 5756e53..daa20a8 100644 --- a/media/libmediaplayerservice/StagefrightRecorder.cpp +++ b/media/libmediaplayerservice/StagefrightRecorder.cpp @@ -56,11 +56,6 @@ StagefrightRecorder::StagefrightRecorder() StagefrightRecorder::~StagefrightRecorder() { LOGV("Destructor"); stop(); - - if (mOutputFd >= 0) { - ::close(mOutputFd); - mOutputFd = -1; - } } status_t StagefrightRecorder::init() { @@ -1158,6 +1153,11 @@ status_t StagefrightRecorder::stop() { mFlags = 0; } + if (mOutputFd >= 0) { + ::close(mOutputFd); + mOutputFd = -1; + } + return OK; } |