summaryrefslogtreecommitdiffstats
path: root/video/out
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-11-01 17:33:11 +0100
committerwm4 <wm4@nowhere>2013-11-01 17:35:38 +0100
commite0b6fdeb8d9a54c357ff9fbf552e1ff4b6282282 (patch)
tree34e5fda2e7e7d2d16dfa41c749f98bcad323f4da /video/out
parent4b6c00c50ad7739c024662be0321eef8015b5829 (diff)
downloadmpv-e0b6fdeb8d9a54c357ff9fbf552e1ff4b6282282.tar.bz2
mpv-e0b6fdeb8d9a54c357ff9fbf552e1ff4b6282282.tar.xz
Fix some more -Wshadow warnings
These aren't printed with newer gcc or clang versions for some reason. All of them seem to be about local variables shadowing global functions.
Diffstat (limited to 'video/out')
-rw-r--r--video/out/gl_video.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/video/out/gl_video.c b/video/out/gl_video.c
index 603f334c9b..d4b4b507c3 100644
--- a/video/out/gl_video.c
+++ b/video/out/gl_video.c
@@ -367,7 +367,7 @@ void gl_video_set_debug(struct gl_video *p, bool enable)
p->gl_debug = enable;
}
-static void tex_size(struct gl_video *p, int w, int h, int *texw, int *texh)
+static void texture_size(struct gl_video *p, int w, int h, int *texw, int *texh)
{
if (p->opts.npot) {
*texw = w;
@@ -457,7 +457,7 @@ static bool fbotex_init(struct gl_video *p, struct fbotex *fbo, int w, int h,
.vp_h = h,
};
- tex_size(p, w, h, &fbo->tex_w, &fbo->tex_h);
+ texture_size(p, w, h, &fbo->tex_w, &fbo->tex_h);
MP_VERBOSE(p, "Create FBO: %dx%d\n", fbo->tex_w, fbo->tex_h);
@@ -1243,8 +1243,8 @@ static void init_video(struct gl_video *p)
plane->w = full_w >> p->image_desc.xs[n];
plane->h = full_h >> p->image_desc.ys[n];
- tex_size(p, plane->w, plane->h,
- &plane->tex_w, &plane->tex_h);
+ texture_size(p, plane->w, plane->h,
+ &plane->tex_w, &plane->tex_h);
MP_VERBOSE(p, "Texture for plane %d: %dx%d\n",
n, plane->tex_w, plane->tex_h);