diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 02:14:30 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-03-10 02:35:02 +0200 |
| commit | bc1d0ca37d9bdfd69a945043650e0246ffeb5f94 (patch) | |
| tree | 8269c9cbc1df72afb5715b77669698a0781f6250 /libvo/video_out.c | |
| parent | f7cc4152f7c55808c5dd6bbd49c216c9345eb686 (diff) | |
| parent | e9a5e7f667d1b0c0dec0053ad9ec6f7bc3162b60 (diff) | |
| download | mpv-bc1d0ca37d9bdfd69a945043650e0246ffeb5f94.tar.bz2 mpv-bc1d0ca37d9bdfd69a945043650e0246ffeb5f94.tar.xz | |
Merge svn changes up to r30798
Diffstat (limited to 'libvo/video_out.c')
| -rw-r--r-- | libvo/video_out.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libvo/video_out.c b/libvo/video_out.c index 31f7ea3dec..08e59fcb0c 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -85,6 +85,7 @@ extern struct vo_driver video_out_xover; extern struct vo_driver video_out_xvmc; 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_gl2; extern struct vo_driver video_out_matrixview; @@ -177,14 +178,15 @@ const struct vo_driver *video_out_drivers[] = #ifdef CONFIG_XV &video_out_xv, #endif +#ifdef CONFIG_X11 #ifdef CONFIG_GL - &video_out_gl, + &video_out_gl_nosw, #endif -#ifdef CONFIG_X11 &video_out_x11, &video_out_xover, #endif #ifdef CONFIG_GL + &video_out_gl, &video_out_gl2, #endif #ifdef CONFIG_DGA |