Mercurial > mplayer.hg

changeset 31023:769929c96d44

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Disable OSD support by default if the necessary OpenGL functionality is missing.
author reimar
date Sat, 24 Apr 2010 16:58:24 +0000
parents d31b184c7c3a
children 0e862bb517b0
files libvo/vo_gl.c
diffstat 1 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_gl.c	Sat Apr 24 16:52:06 2010 +0000
+++ b/libvo/vo_gl.c	Sat Apr 24 16:58:24 2010 +0000
@@ -490,6 +490,8 @@
     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 @@
     gltype = GLTYPE_W32;
 #endif
     many_fmts = 1;
-    use_osd = 1;
+    use_osd = -1;
     scaled_osd = 0;
     use_aspect = 1;
     use_ycbcr = 0;