diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-27 18:16:41 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-02-27 18:16:41 +0000 |
| commit | e92eaa0fd82d5824eb6a29acd7886b4331ad3087 (patch) | |
| tree | 5cbabe7233c578df583d3d8fff00a746374c8341 /libvo/video_out.c | |
| parent | 05c24134de2923762a718b4e1c31c60131d46124 (diff) | |
| download | mpv-e92eaa0fd82d5824eb6a29acd7886b4331ad3087.tar.bz2 mpv-e92eaa0fd82d5824eb6a29acd7886b4331ad3087.tar.xz | |
Only prefer -vo gl over -vo x11 if hardware acceleration is available.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30761 b3059339-0415-0410-9bf9-f77b7e298cf2
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 d721e0a526..8fca2b85c2 100644 --- a/libvo/video_out.c +++ b/libvo/video_out.c @@ -94,6 +94,7 @@ extern vo_functions_t video_out_xover; extern vo_functions_t video_out_xvmc; extern vo_functions_t video_out_vdpau; extern vo_functions_t video_out_xv; +extern vo_functions_t video_out_gl_nosw; extern vo_functions_t video_out_gl; extern vo_functions_t video_out_gl2; extern vo_functions_t video_out_matrixview; @@ -186,14 +187,15 @@ const vo_functions_t* const 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 |