diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp
index d3be3bc..1562574 100644
--- a/media/libstagefright/OMXCodec.cpp
+++ b/media/libstagefright/OMXCodec.cpp
@@ -2210,6 +2210,7 @@
         return err;
     }
 
+#ifdef QCOM_HARDWARE
     //add an extra buffer to display queue to get around dequeue+wait
     //blocking too long (more than 1 Vsync) in case BufferQeuue is in
     //sync-mode and advertizes only 1 buffer
@@ -2217,6 +2218,7 @@
     //      regardless this root-cause is identified in SF
     minUndequeuedBufs++;
     ALOGI("NOTE: Overriding minUndequeuedBufs to %d",minUndequeuedBufs);
+#endif
 
     // XXX: Is this the right logic to use?  It's not clear to me what the OMX
     // buffer counts refer to - how do they account for the renderer holding on