From ce4d38385c17c13078f987783a6f8e936797d807 Mon Sep 17 00:00:00 2001 From: reimar Date: Fri, 30 Apr 2010 17:12:52 +0000 Subject: 100l, open the customtex also in binary mode, not just the program. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31106 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_gl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libvo/vo_gl.c') diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index c44e21a3e8..3b9b4eb513 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -264,7 +264,7 @@ static void update_yuvconv(void) { texture_width, texture_height); } if (custom_tex) { - FILE *f = fopen(custom_tex, "r"); + FILE *f = fopen(custom_tex, "rb"); if (!f) mp_msg(MSGT_VO, MSGL_WARN, "[gl] Could not read customtex %s\n", custom_tex); -- cgit v1.2.3 From fa6239aea034da3fdc4be76007a8bc06daa1093b Mon Sep 17 00:00:00 2001 From: reimar Date: Sat, 1 May 2010 22:49:05 +0000 Subject: Also print OpenGL renderer string with vendor and version with -v git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31127 b3059339-0415-0410-9bf9-f77b7e298cf2 --- libvo/vo_gl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'libvo/vo_gl.c') diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index 3b9b4eb513..e4b7158f3f 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -477,9 +477,10 @@ static void autodetectGlExtensions(void) { const char *extensions = mpglGetString(GL_EXTENSIONS); const char *vendor = mpglGetString(GL_VENDOR); const char *version = mpglGetString(GL_VERSION); + const char *renderer = mpglGetString(GL_RENDERER); int is_ati = vendor && strstr(vendor, "ATI") != NULL; int ati_broken_pbo = 0; - mp_msg(MSGT_VO, MSGL_V, "[gl] Running on OpenGL by '%s', versions '%s'\n", vendor, version); + mp_msg(MSGT_VO, MSGL_V, "[gl] Running on OpenGL '%s' by '%s', version '%s'\n", renderer, vendor, version); if (is_ati && strncmp(version, "2.1.", 4) == 0) { int ver = atoi(version + 4); mp_msg(MSGT_VO, MSGL_V, "[gl] Detected ATI driver version: %i\n", ver); -- cgit v1.2.3