--- a/khronosfws/openmax_al/src/engine/xaengineitf.c	Fri May 14 18:19:45 2010 -0500
+++ b/khronosfws/openmax_al/src/engine/xaengineitf.c	Fri May 28 19:26:28 2010 -0500
@@ -52,9 +52,13 @@
                                             const XAboolean *pInterfaceRequired)
 {
     XAEngineItfImpl* impl = GetImpl(self);
+#ifdef OMAX_CAMERABIN
     return XACameraDeviceImpl_CreateCameraDevice( impl->mapper,impl->capabilities,
                                                     pDevice, deviceID,numInterfaces,
                                                     pInterfaceIds, pInterfaceRequired );
+#else
+    return XA_RESULT_FEATURE_UNSUPPORTED;
+#endif
 }
 
 XAresult XAEngineItfImpl_CreateRadioDevice(XAEngineItf self,
@@ -249,10 +253,12 @@
             res = XAOMixImpl_QueryNumSupportedInterfaces(
                                             pNumSupportedInterfaces);
             break;
+#ifdef OMAX_CAMERABIN
         case XA_OBJECTID_CAMERADEVICE:
             res = XACameraDeviceImpl_QueryNumSupportedInterfaces(
                                             pNumSupportedInterfaces);
             break;
+#endif
         case XA_OBJECTID_RADIODEVICE:
             res = XARadioDeviceImpl_QueryNumSupportedInterfaces(
                                             pNumSupportedInterfaces);
@@ -311,10 +317,12 @@
             res = XAOMixImpl_QuerySupportedInterfaces(
                                                 index, pInterfaceId);
             break;
+#ifdef OMAX_CAMERABIN
         case XA_OBJECTID_CAMERADEVICE:
             res = XACameraDeviceImpl_QuerySupportedInterfaces(
                                                 index, pInterfaceId );
             break;
+#endif
         case XA_OBJECTID_RADIODEVICE:
             res = XARadioDeviceImpl_QuerySupportedInterfaces(
                                                 index, pInterfaceId );