diff --git a/DOCS/interface-changes/mediacodec_embed.txt b/DOCS/interface-changes/mediacodec_embed.txt
new file mode 100644
index 0000000000..b6d71e4e0c
--- /dev/null
+++ b/DOCS/interface-changes/mediacodec_embed.txt
@@ -0,0 +1 @@
+mediacodec_embed is no longer the default `vo` on Android, set the option explicitly if you want to use it and are aware of the limitations.
diff --git a/video/out/vo.c b/video/out/vo.c
index ac2d91e1cd..fc90c428d5 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -69,11 +69,10 @@ extern const struct vo_driver video_out_kitty;
 
 static const struct vo_driver *const video_out_drivers[] =
 {
-#if HAVE_ANDROID
-    &video_out_mediacodec_embed,
-#endif
+    // high-quality and well-supported VOs first:
     &video_out_gpu,
     &video_out_gpu_next,
+
 #if HAVE_VDPAU
     &video_out_vdpau,
 #endif
@@ -86,6 +85,9 @@ static const struct vo_driver *const video_out_drivers[] =
 #if HAVE_XV
     &video_out_xv,
 #endif
+#if HAVE_ANDROID
+    &video_out_mediacodec_embed,
+#endif
 #if HAVE_SDL2_VIDEO
     &video_out_sdl,
 #endif
@@ -100,6 +102,7 @@ static const struct vo_driver *const video_out_drivers[] =
 #endif
     &video_out_libmpv,
     &video_out_null,
+
     // should not be auto-selected
     &video_out_image,
     &video_out_tct,