From 19458020a6507c4729706f7bd5f17eb07da3cc51 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Fri, 16 Mar 2012 22:00:32 +0100 Subject: [PATCH] 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. --- libvo/video_out.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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