summaryrefslogtreecommitdiffstats
path: root/video/decode/vd_lavc.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-07-23 00:45:23 +0200
committerwm4 <wm4@nowhere>2013-07-23 00:45:23 +0200
commite83cbde1a4b816a64cefde1fb8bdbac403079600 (patch)
tree1ac71b13723174ab48465915fd5e9916faa7df35 /video/decode/vd_lavc.c
parent78ebb3c6fa637206bb369349ba93328b36895e2b (diff)
downloadmpv-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/decode/vd_lavc.c')
-rw-r--r--video/decode/vd_lavc.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index 978462fbe5..3ee1b40bb8 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -96,7 +96,7 @@ struct hwdec {
const char *codec, *hw_codec;
};
-static const struct hwdec hwdec[] = {
+static const struct hwdec hwdec_list[] = {
{HWDEC_VDPAU, "h264", "h264_vdpau"},
{HWDEC_VDPAU, "wmv3", "wmv3_vdpau"},
{HWDEC_VDPAU, "vc1", "vc1_vdpau"},
@@ -120,9 +120,9 @@ static const struct hwdec hwdec[] = {
static struct hwdec *find_hwcodec(enum hwdec_type api, const char *codec)
{
- for (int n = 0; hwdec[n].api; n++) {
- if (hwdec[n].api == api && strcmp(hwdec[n].codec, codec) == 0)
- return (struct hwdec *)&hwdec[n];
+ for (int n = 0; hwdec_list[n].api; n++) {
+ if (hwdec_list[n].api == api && strcmp(hwdec_list[n].codec, codec) == 0)
+ return (struct hwdec *)&hwdec_list[n];
}
return NULL;
}