diff options
| -rw-r--r-- | media/jni/android_media_MediaCodecList.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/media/jni/android_media_MediaCodecList.cpp b/media/jni/android_media_MediaCodecList.cpp index ecba02abb934..12eb7d24aed4 100644 --- a/media/jni/android_media_MediaCodecList.cpp +++ b/media/jni/android_media_MediaCodecList.cpp @@ -85,6 +85,7 @@ static jint android_media_MediaCodecList_findCodecByName( sp<IMediaCodecList> mcl = getCodecList(env); if (mcl == NULL) { // Runtime exception already pending. + env->ReleaseStringUTFChars(name, nameStr); return -ENOENT; } @@ -162,7 +163,6 @@ static jobject android_media_MediaCodecList_getCodecCapabilities( } const char *typeStr = env->GetStringUTFChars(type, NULL); - if (typeStr == NULL) { // Out of memory exception already pending. return NULL; @@ -177,12 +177,12 @@ static jobject android_media_MediaCodecList_getCodecCapabilities( // TODO query default-format also from codec/codec list const sp<MediaCodecInfo::Capabilities> &capabilities = info->getCapabilitiesFor(typeStr); + env->ReleaseStringUTFChars(type, typeStr); + typeStr = NULL; if (capabilities == NULL) { jniThrowException(env, "java/lang/IllegalArgumentException", NULL); return NULL; } - env->ReleaseStringUTFChars(type, typeStr); - typeStr = NULL; capabilities->getSupportedColorFormats(&colorFormats); capabilities->getSupportedProfileLevels(&profileLevels); |