summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorStefano Pigozzi <stefano.pigozzi@gmail.com>2012-03-16 22:00:32 +0100
committerUoti Urpala <uau@mplayer2.org>2012-03-25 22:30:37 +0300
commit19458020a6507c4729706f7bd5f17eb07da3cc51 (patch)
tree1883b58785c4268d0a43290356ab7da99d788a57 /libvo
parente37d7b14522b56432c0d81a6b5ab1ce3f118cd4a (diff)
downloadmpv-19458020a6507c4729706f7bd5f17eb07da3cc51.tar.bz2
mpv-19458020a6507c4729706f7bd5f17eb07da3cc51.tar.xz
VO: move gl+cocoa before corevideo in default VO order
The gl video output is faster and has more features than corevideo, so it should be preferred on mac osx. This doesn't affect GUI compatibility because they specify the corevideo video output along with the suboptions for the shared buffer name to mmap in.
Diffstat (limited to 'libvo')
-rw-r--r--libvo/video_out.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c
index 1ac5164ada..82fe4f8550 100644
--- a/libvo/video_out.c
+++ b/libvo/video_out.c
@@ -137,6 +137,9 @@ const struct vo_driver *video_out_drivers[] =
#ifdef CONFIG_KVA
&video_out_kva,
#endif
+#ifdef CONFIG_GL_COCOA
+ &video_out_gl,
+#endif
#ifdef CONFIG_COREVIDEO
&video_out_corevideo,
#endif
@@ -174,7 +177,7 @@ const struct vo_driver *video_out_drivers[] =
#ifdef CONFIG_SDL
&video_out_sdl,
#endif
-#ifdef CONFIG_GL
+#if (defined CONFIG_GL && !defined CONFIG_GL_COCOA)
&video_out_gl,
#endif
#ifdef CONFIG_GL_SDL