Mercurial > mplayer.hg

changeset 36240:e8640e3f9b7e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
gl: Ensure gpu_def_sl_program is correctly initialized.
author reimar
date Wed, 12 Jun 2013 18:54:12 +0000
parents 96be2eda6b76
children 0cfa55e44ea5
files libvo/gl_common.c
diffstat 1 files changed, 4 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/gl_common.c	Wed Jun 12 14:26:15 2013 +0000
+++ b/libvo/gl_common.c	Wed Jun 12 18:54:12 2013 +0000
@@ -2171,6 +2171,7 @@
     *vinfo = new_vinfo;
     getFunctions(w32gpa, NULL);
 
+    gpu_def_sl_program = 0;
     gpu_yuv_sl_program = 0;
 
     // and inform that reinit is neccessary
@@ -2320,6 +2321,7 @@
     }
     free(glxstr);
 
+    gpu_def_sl_program = 0;
     gpu_yuv_sl_program = 0;
 
     // and inform that reinit is neccessary
@@ -2374,6 +2376,7 @@
     return SET_WINDOW_FAILED;
   SDL_GL_LoadLibrary(NULL);
   getFunctions(sdlgpa, NULL);
+  gpu_def_sl_program = 0;
   gpu_yuv_sl_program = 0;
   return SET_WINDOW_OK;
 }
@@ -2601,6 +2604,7 @@
 
 static int setGlWindow_dummy(MPGLContext *ctx) {
   getFunctions(NULL, NULL);
+  gpu_def_sl_program = 0;
   gpu_yuv_sl_program = 0;
   return SET_WINDOW_OK;
 }