diff --git a/device.mk b/device.mk
index b69c908..b7112a0 100644
--- a/device.mk
+++ b/device.mk
@@ -253,16 +253,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.hardware.usb.host.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.usb.host.xml \
frameworks/native/data/etc/android.software.midi.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.midi.xml
-# V4L2
-PRODUCT_SOONG_NAMESPACES += external/v4l2_codec2
-
-PRODUCT_PACKAGES += \
- android.hardware.media.c2@1.0-service-v4l2 \
- libc2plugin_store
-
-PRODUCT_COPY_FILES += \
- $(DEVICE_PATH)/media/media_codecs_v4l2_c2_video.xml:$(TARGET_COPY_OUT_VENDOR)/etc/media_codecs_v4l2_c2_video.xml
-
# Virtualization
$(call inherit-product, packages/modules/Virtualization/apex/product_packages.mk)
diff --git a/framework_compatibility_matrix.xml b/framework_compatibility_matrix.xml
index 077c79f..da5e17b 100644
--- a/framework_compatibility_matrix.xml
+++ b/framework_compatibility_matrix.xml
@@ -2,11 +2,10 @@
android.hardware.media.c2
hwbinder
- 1.0-2
+ 1.2
IComponentStore
ffmpeg
- v4l2
diff --git a/media/media_codecs.xml b/media/media_codecs.xml
index 6f14e18..9165b42 100644
--- a/media/media_codecs.xml
+++ b/media/media_codecs.xml
@@ -18,7 +18,6 @@
-
diff --git a/media/media_codecs_v4l2_c2_video.xml b/media/media_codecs_v4l2_c2_video.xml
deleted file mode 100644
index e20e747..0000000
--- a/media/media_codecs_v4l2_c2_video.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/ramdisk/ueventd.rpi5.rc b/ramdisk/ueventd.rpi5.rc
index 27e1d93..559c99f 100644
--- a/ramdisk/ueventd.rpi5.rc
+++ b/ramdisk/ueventd.rpi5.rc
@@ -13,18 +13,12 @@
# DMA
/dev/dma_heap/linux,cma 0666 system graphics
+# FFmpeg
+/dev/media2 0660 media media
+/dev/video19 0660 media media
+
# ION
/dev/ion 0664 system system
# USB
/sys/class/udc/fe980000.usb current_speed 0664 system system
-
-# V4L2
-/dev/media0 0660 media media
-/dev/media1 0660 media media
-/dev/video10 0660 media media
-/dev/video11 0660 media media
-/dev/video12 0660 media media
-/dev/video18 0660 media media
-/dev/video19 0660 media media
-/dev/video31 0660 media media
diff --git a/sepolicy/file_contexts b/sepolicy/file_contexts
index b25462a..0b9cc17 100644
--- a/sepolicy/file_contexts
+++ b/sepolicy/file_contexts
@@ -49,6 +49,3 @@
# USB
/vendor/bin/hw/android\.hardware\.usb\.gadget@1\.2-service\.rpi u:object_r:hal_usb_gadget_default_exec:s0
-
-# V4L2
-/vendor/bin/hw/android\.hardware\.media\.c2@1\.0-service-v4l2(.*)? u:object_r:mediacodec_exec:s0
diff --git a/vendor.prop b/vendor.prop
index 9f35e5d..de3fe80 100644
--- a/vendor.prop
+++ b/vendor.prop
@@ -46,7 +46,6 @@ debug.drm.mode.force=1920x1080
# FFmpeg
persist.ffmpeg_codec2.rank.audio=16
persist.ffmpeg_codec2.rank.video=256
-persist.ffmpeg_codec2.v4l2.h264=false
persist.ffmpeg_codec2.v4l2.h265=true
# Graphics
@@ -74,13 +73,6 @@ debug.stagefright.c2inputsurface=-1
# MGLRU
persist.device_config.mglru_native.lru_gen_config=core
-# V4L2
-debug.stagefright.c2-poolmask=0xf50000
-persist.v4l2_codec2.rank.decoder=128
-persist.v4l2_codec2.rank.encoder=128
-ro.vendor.v4l2_codec2.decode_concurrent_instances=8
-ro.vendor.v4l2_codec2.encode_concurrent_instances=8
-
# Wifi
wifi.interface=wlan0