summaryrefslogtreecommitdiffstats
path: root/video/sws_utils.c
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/sws_utils.c
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/sws_utils.c')
-rw-r--r--video/sws_utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/video/sws_utils.c b/video/sws_utils.c
index c6696ec37b..27cd0c7330 100644
--- a/video/sws_utils.c
+++ b/video/sws_utils.c
@@ -161,9 +161,9 @@ static void free_mp_sws(void *p)
// You're supposed to set your scaling parameters on the returned context.
// Free the context with talloc_free().
-struct mp_sws_context *mp_sws_alloc(void *talloc_parent)
+struct mp_sws_context *mp_sws_alloc(void *talloc_ctx)
{
- struct mp_sws_context *ctx = talloc_ptrtype(talloc_parent, ctx);
+ struct mp_sws_context *ctx = talloc_ptrtype(talloc_ctx, ctx);
*ctx = (struct mp_sws_context) {
.flags = SWS_BILINEAR,
.contrast = 1 << 16, // 1.0 in 16.16 fixed point