diff options
author | wm4 <wm4@nowhere> | 2013-07-23 00:45:23 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-07-23 00:45:23 +0200 |
commit | e83cbde1a4b816a64cefde1fb8bdbac403079600 (patch) | |
tree | 1ac71b13723174ab48465915fd5e9916faa7df35 /video/filter/vf_scale.c | |
parent | 78ebb3c6fa637206bb369349ba93328b36895e2b (diff) | |
download | mpv-e83cbde1a4b816a64cefde1fb8bdbac403079600.tar.bz2 mpv-e83cbde1a4b816a64cefde1fb8bdbac403079600.tar.xz |
Fix some -Wshadow warnings
In general, this warning can hint to actual bugs. We don't enable it
yet, because it would conflict with some unmerged code, and we should
check with clang too (this commit was done by testing with gcc).
Diffstat (limited to 'video/filter/vf_scale.c')
-rw-r--r-- | video/filter/vf_scale.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/video/filter/vf_scale.c b/video/filter/vf_scale.c index 738487f7d8..35c9e3cbae 100644 --- a/video/filter/vf_scale.c +++ b/video/filter/vf_scale.c @@ -203,15 +203,15 @@ static unsigned int find_best_out(vf_instance_t *vf, int in_format) } if (!best) { // Try anything else. outfmt_list is just a list of preferred formats. - for (int format = IMGFMT_START; format < IMGFMT_END; format++) { - int ret = check_outfmt(vf, format); + for (int cur = IMGFMT_START; cur < IMGFMT_END; cur++) { + int ret = check_outfmt(vf, cur); if (ret & VFCAP_CSP_SUPPORTED_BY_HW) { - best = format; // no conversion -> bingo! + best = cur; // no conversion -> bingo! break; } if (ret & VFCAP_CSP_SUPPORTED && !best) - best = format; // best with conversion + best = cur; // best with conversion } } return best; |