diff --git a/include/media/stagefright/foundation/AMessage.h b/include/media/stagefright/foundation/AMessage.h
index e5416e4..7e823eb 100644
--- a/include/media/stagefright/foundation/AMessage.h
+++ b/include/media/stagefright/foundation/AMessage.h
@@ -138,7 +138,7 @@
     };
 
     enum {
-        kMaxNumItems = 32
+        kMaxNumItems = 64
     };
     Item mItems[kMaxNumItems];
     size_t mNumItems;
diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
index 5733229..25974b6 100644
--- a/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
+++ b/media/libmediaplayerservice/nuplayer/NuPlayerDecoder.cpp
@@ -116,9 +116,7 @@
 
         msg->setInt32("width", width);
         msg->setInt32("height", height);
-    } else {
-        CHECK(!strncasecmp("audio/", mime, 6));
-
+    } else if (!strncasecmp("audio/", mime, 6)) {
         int32_t numChannels, sampleRate;
         CHECK(meta->findInt32(kKeyChannelCount, &numChannels));
         CHECK(meta->findInt32(kKeySampleRate, &sampleRate));
diff --git a/media/libstagefright/NuMediaExtractor.cpp b/media/libstagefright/NuMediaExtractor.cpp
index 5d218e4..7cfb8ea 100644
--- a/media/libstagefright/NuMediaExtractor.cpp
+++ b/media/libstagefright/NuMediaExtractor.cpp
@@ -198,9 +198,7 @@
 
         msg->setInt32("width", width);
         msg->setInt32("height", height);
-    } else {
-        CHECK(!strncasecmp("audio/", mime, 6));
-
+    } else if (!strncasecmp("audio/", mime, 6)) {
         int32_t numChannels, sampleRate;
         CHECK(meta->findInt32(kKeyChannelCount, &numChannels));
         CHECK(meta->findInt32(kKeySampleRate, &sampleRate));