diff --git a/device.mk b/device.mk
index d8149fae..b105d579 100644
--- a/device.mk
+++ b/device.mk
@@ -689,6 +689,10 @@ PRODUCT_PROPERTY_OVERRIDES += \
        debug.stagefright.ccodec_delayed_params=1 \
        ro.vendor.gpu.dataspace=1
 
+# Create input surface on the framework side
+PRODUCT_PROPERTY_OVERRIDES += \
+	debug.stagefright.c2inputsurface=-1 \
+
 # 2. OpenMAX IL
 PRODUCT_COPY_FILES += \
 	device/google/gs201/media_codecs.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs.xml \