From 51fd8f6fe16ef0a8fa35aec89cab82d435e4d4d9 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 8 Dec 2016 10:59:50 +0100
Subject: vo_rpi: partially undeprecate

Using vo_opengl + MMAL overlay didn't quite work out.
---
 video/out/vo.c     | 6 +++---
 video/out/vo_rpi.c | 3 ---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/video/out/vo.c b/video/out/vo.c
index 72a47af227..64bf7ab051 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -63,6 +63,9 @@ extern const struct vo_driver video_out_tct;
 
 const struct vo_driver *const video_out_drivers[] =
 {
+#if HAVE_RPI
+    &video_out_rpi,
+#endif
 #if HAVE_GL
     &video_out_opengl,
 #endif
@@ -102,9 +105,6 @@ 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 4824ac2616..139da95ed9 100644
--- a/video/out/vo_rpi.c
+++ b/video/out/vo_rpi.c
@@ -869,9 +869,6 @@ 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