summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Martin Storsjo <martin@martin.st> 2012-07-13 13:01:06 +0300
committer Andreas Huber <andih@google.com> 2012-08-07 11:11:24 -0700
commitd932de9aff49d1d9f752ad479b42854d2557c881 (patch)
tree91a9e66f68a0ce5b7e3680d1e1989ffdbb8ce878
parentb529e4c9ca8a6790162275ac2e481f768a6d585f (diff)
mediacodec: Don't crash if trying to open a codec that does not exist
Change-Id: If75e3156517993629f50622a84a9ac573fced815
-rw-r--r--media/jni/android_media_MediaCodec.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/media/jni/android_media_MediaCodec.cpp b/media/jni/android_media_MediaCodec.cpp
index e43e66e6363a..4941ae52b680 100644
--- 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();