Merge "Disable Codec 2.0" into rvc-dev
diff --git a/shared/device.mk b/shared/device.mk
index 119fb44..3a9797c 100644
--- a/shared/device.mk
+++ b/shared/device.mk
@@ -76,6 +76,10 @@
 PRODUCT_PROPERTY_OVERRIDES += \
     wlan.driver.status=ok
 
+# Codec 2.0 is unstable on x86
+PRODUCT_PROPERTY_OVERRIDES += \
+    debug.stagefright.ccodec=0
+
 # Enforce privapp-permissions whitelist.
 PRODUCT_PROPERTY_OVERRIDES += ro.control_privapp_permissions=enforce