summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-12-08 10:59:50 +0100
committerwm4 <wm4@nowhere>2016-12-08 11:00:14 +0100
commit51fd8f6fe16ef0a8fa35aec89cab82d435e4d4d9 (patch)
tree03caadfdefcd3658bc9a5fa2874e834e2185547d
parent3eceac2eab0b42ee082a0b615ebf40a21f0fb915 (diff)
downloadmpv-51fd8f6fe16ef0a8fa35aec89cab82d435e4d4d9.tar.bz2
mpv-51fd8f6fe16ef0a8fa35aec89cab82d435e4d4d9.tar.xz
vo_rpi: partially undeprecate
Using vo_opengl + MMAL overlay didn't quite work out.
-rw-r--r--video/out/vo.c6
-rw-r--r--video/out/vo_rpi.c3
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
@@ -103,9 +106,6 @@ const struct vo_driver *const video_out_drivers[] =
#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;