commit 158b194da537c18a6ad1d7ef3cd63c87b2310269
author Andreas Huber <andih@google.com> Thu Jun 02 14:24:20 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jun 02 14:24:20 2011 -0700
tree 7aa80650cc994baf37e86a0deadd150c5c7f0b74
parent 92a746c3b18d035189f596ce32847bf26247aaca
parent 2f0a8405f00a6e2e7e9f1cc47ac803ac01d5dfd5

Merge "Don't advertise the (old-style) software decoders unless they're actually present."

media/libstagefright/OMXCodec.cpp

diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index 6339710..e71f16c 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -4256,9 +4256,11 @@
         if (strncmp(componentName, "OMX.", 4)) {
             // Not an OpenMax component but a software codec.
 
+#if HAVE_SOFTWARE_DECODERS
             results->push();
             CodecCapabilities *caps = &results->editItemAt(results->size() - 1);
             caps->mComponentName = componentName;
+#endif
 
             continue;
         }