diff options
| author | wm4 <wm4@nowhere> | 2013-07-08 21:55:44 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-07-08 21:55:44 +0200 |
| commit | 31f685040bd2152d541ed16cf441c6b5e7e430fd (patch) | |
| tree | b8351b2847231bbc15d883a622ac972945cce6b4 /video/out/gl_video.c | |
| parent | 73c76de91edbf8a55eb725196ff54583e3428510 (diff) | |
| parent | 7a71a2cc483d17bed94408d5aee6fba6893558cb (diff) | |
| download | mpv-31f685040bd2152d541ed16cf441c6b5e7e430fd.tar.bz2 mpv-31f685040bd2152d541ed16cf441c6b5e7e430fd.tar.xz | |
Merge branch 'master' into remove_old_demuxers
Conflicts:
DOCS/man/en/changes.rst
DOCS/man/en/options.rst
Diffstat (limited to 'video/out/gl_video.c')
| -rw-r--r-- | video/out/gl_video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c index bdca0a1ff4..4022d5fa8e 100644 --- a/video/out/gl_video.c +++ b/video/out/gl_video.c @@ -507,7 +507,7 @@ static void update_uniforms(struct gl_video *p, GLuint program) for (int n = 0; n < p->plane_count; n++) { char textures_n[32]; char textures_size_n[32]; - snprintf(textures_n, sizeof(textures_n), "textures[%d]", n); + snprintf(textures_n, sizeof(textures_n), "texture%d", n); snprintf(textures_size_n, sizeof(textures_size_n), "textures_size[%d]", n); gl->Uniform1i(gl->GetUniformLocation(program, textures_n), n); |