diff options
| author | wm4 <wm4@nowhere> | 2012-09-23 16:10:00 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-03 03:17:39 +0200 |
| commit | 3611d1bf9ba6f34909108166aaa21deaffc72c57 (patch) | |
| tree | cd7c2ee5c1a50140d417e7a1a761b6ac4f12cfd4 /libvo/video_out.c | |
| parent | 4ecb1b53debb54e5dccf460fb245416148afbfa8 (diff) | |
| download | mpv-3611d1bf9ba6f34909108166aaa21deaffc72c57.tar.bz2 mpv-3611d1bf9ba6f34909108166aaa21deaffc72c57.tar.xz | |
VO: actually rename VOs gl -> opengl-old, gl3 -> opengl
This renames vo_gl3 to vo_opengl, and makes it the default. The old
vo_gl is still available under "opengl-old".
We keep "gl3" as alias to "opengl" for short-term compatibility.
For OSX/Cocoa, the autoprobe order changes (prefer the "opengl" over
"opengl-old").
Remove "gl_nosw". This was a compatibility alias for "opengl-old", and
there's no point in keeping it.
Diffstat (limited to 'libvo/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 2be311f87c..f75d9f273c 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -73,8 +73,8 @@ int vo_colorkey = 0x0000ff00; // default colorkey is green extern struct vo_driver video_out_x11; extern struct vo_driver video_out_vdpau; extern struct vo_driver video_out_xv; -extern struct vo_driver video_out_gl_nosw; -extern struct vo_driver video_out_gl; +extern struct vo_driver video_out_opengl; +extern struct vo_driver video_out_opengl_old; extern struct vo_driver video_out_gl3; extern struct vo_driver video_out_null; extern struct vo_driver video_out_image; @@ -91,7 +91,8 @@ const struct vo_driver *video_out_drivers[] = &video_out_direct3d, #endif #ifdef CONFIG_GL_COCOA - &video_out_gl, + &video_out_opengl, + &video_out_opengl_old, #endif #ifdef CONFIG_COREVIDEO &video_out_corevideo, @@ -103,9 +104,9 @@ const struct vo_driver *video_out_drivers[] = &video_out_xv, #endif #ifdef CONFIG_GL - &video_out_gl3, #if !defined CONFIG_GL_COCOA - &video_out_gl, + &video_out_opengl, + &video_out_opengl_old, #endif #endif #ifdef CONFIG_X11 @@ -120,10 +121,8 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_ENCODING &video_out_lavc, #endif -#ifdef CONFIG_X11 #ifdef CONFIG_GL - &video_out_gl_nosw, -#endif + &video_out_gl3, #endif NULL }; |