diff options
| author | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-24 16:58:24 +0000 |
|---|---|---|
| committer | reimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-04-24 16:58:24 +0000 |
| commit | 5c4cc997caeeb87675cfc7b9c97206bc4d9568ff (patch) | |
| tree | 2596ae596230f8cd96eec8d9a261496c1348e1e4 /libvo | |
| parent | abfa4e2ae99093ef4cd813bb0045b57e0c6f4faf (diff) | |
| download | mpv-5c4cc997caeeb87675cfc7b9c97206bc4d9568ff.tar.bz2 mpv-5c4cc997caeeb87675cfc7b9c97206bc4d9568ff.tar.xz | |
Disable OSD support by default if the necessary OpenGL functionality is missing.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31065 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libvo')
| -rw-r--r-- | libvo/vo_gl.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 55c272b88c..7d48e35d22 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -490,6 +490,8 @@ static void autodetectGlExtensions(void) { force_pbo = strstr(extensions, "_pixel_buffer_object") ? is_ati : 0; if (extensions && use_rectangle == -1) use_rectangle = strstr(extensions, "_texture_non_power_of_two") ? 0 : 0; + if (use_osd == -1) + use_osd = mpglBindTexture != NULL; if (use_yuv == -1) use_yuv = glAutodetectYUVConversion(); if (is_ati && (lscale == 1 || lscale == 2 || cscale == 1 || cscale == 2)) @@ -1106,7 +1108,7 @@ static int preinit_internal(const char *arg, int allow_sw) gltype = GLTYPE_W32; #endif many_fmts = 1; - use_osd = 1; + use_osd = -1; scaled_osd = 0; use_aspect = 1; use_ycbcr = 0; |