diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-23 11:34:38 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-23 11:34:38 -0400 |
| commit | 7b70cfc35c8555eda186fd0b792f013a4b082cff (patch) | |
| tree | 48adef9d53131aaf3f5a0f96adb7311d5a3e144a /media | |
| parent | 09d88b00dbd0a04ed45a661590cca49d6e5b42f5 (diff) | |
| parent | 2d6d6e9a3d569eda4555c4eb68cec452be958bb1 (diff) | |
| download | frameworks_av-7b70cfc35c8555eda186fd0b792f013a4b082cff.zip frameworks_av-7b70cfc35c8555eda186fd0b792f013a4b082cff.tar.gz frameworks_av-7b70cfc35c8555eda186fd0b792f013a4b082cff.tar.bz2 | |
Merge change Icb64cd2c into eclair-mr2
* changes:
Still don't know why the heap gets corrupted, but not deleting the OMXNodeInstance appears to prevent this from happening.
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/omx/OMXNodeInstance.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/media/libstagefright/omx/OMXNodeInstance.cpp b/media/libstagefright/omx/OMXNodeInstance.cpp index d277587..84d0d4b 100644 --- a/media/libstagefright/omx/OMXNodeInstance.cpp +++ b/media/libstagefright/omx/OMXNodeInstance.cpp @@ -120,7 +120,8 @@ status_t OMXNodeInstance::freeNode() { mNodeID = NULL; LOGI("OMXNodeInstance going away."); - delete this; + mObserver.clear(); + // delete this; // leads to heap-corruption??? return StatusFromOMXError(err); } |