From 0e72f64ff46747d4b1399d6cb7803e3f675d047c Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Mon, 12 Sep 2016 19:58:06 +0200
Subject: vo_rpi: deprecate this VO

---
 video/out/vo.c     | 6 +++---
 video/out/vo_rpi.c | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'video')

diff --git a/video/out/vo.c b/video/out/vo.c
index 2ad57eff7f..8c66b0dab3 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -62,9 +62,6 @@ extern const struct vo_driver video_out_rpi;
 
 const struct vo_driver *const video_out_drivers[] =
 {
-#if HAVE_RPI
-    &video_out_rpi,
-#endif
 #if HAVE_GL
     &video_out_opengl,
 #endif
@@ -103,6 +100,9 @@ const struct vo_driver *const video_out_drivers[] =
 #endif
 #if HAVE_GL
     &video_out_opengl_cb,
+#endif
+#if HAVE_RPI
+    &video_out_rpi,
 #endif
     NULL
 };
diff --git a/video/out/vo_rpi.c b/video/out/vo_rpi.c
index 9a1280584c..de5a8bf5e1 100644
--- a/video/out/vo_rpi.c
+++ b/video/out/vo_rpi.c
@@ -740,6 +740,9 @@ static void uninit(struct vo *vo)
 
 static int preinit(struct vo *vo)
 {
+    MP_WARN(vo, "This VO is deprecated! Use --vo=opengl instead (which has "
+                "the same features and which is the default).\n");
+
     struct priv *p = vo->priv;
 
     p->background_layer = p->layer;
-- 
cgit v1.2.3