Merge "mediacodec: Don't crash if trying to open a codec that does not exist"

2012-08-13 09:30:11 -07:00
parent f0e87175ba e68323325b
commit 4da3769d30
1 changed files with 4 additions and 1 deletions
--- a/media/jni/android_media_MediaCodec.cpp
+++ b/media/jni/android_media_MediaCodec.cpp
@@ -96,7 +96,10 @@ status_t JMediaCodec::initCheck() const {
 }

 JMediaCodec::~JMediaCodec() {
-    mCodec->release();
+    if (mCodec != NULL) {
+        mCodec->release();
+        mCodec.clear();
+    }

    JNIEnv *env = AndroidRuntime::getJNIEnv();