diff options
| author | wm4 <wm4@nowhere> | 2013-11-01 17:33:11 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-11-01 17:35:38 +0100 |
| commit | e0b6fdeb8d9a54c357ff9fbf552e1ff4b6282282 (patch) | |
| tree | 34e5fda2e7e7d2d16dfa41c749f98bcad323f4da /stream | |
| parent | 4b6c00c50ad7739c024662be0321eef8015b5829 (diff) | |
| download | mpv-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 'stream')
| -rw-r--r-- | stream/tvi_def.h | 4 | ||||
| -rw-r--r-- | stream/tvi_dummy.c | 2 | ||||
| -rw-r--r-- | stream/tvi_v4l2.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/stream/tvi_def.h b/stream/tvi_def.h index 959237aa04..41c1427e98 100644 --- a/stream/tvi_def.h +++ b/stream/tvi_def.h @@ -26,7 +26,7 @@ static int init(priv_t *priv); static int uninit(priv_t *priv); -static int control(priv_t *priv, int cmd, void *arg); +static int do_control(priv_t *priv, int cmd, void *arg); static int start(priv_t *priv); static double grab_video_frame(priv_t *priv, char *buffer, int len); static int get_video_framesize(priv_t *priv); @@ -37,7 +37,7 @@ static const tvi_functions_t functions = { init, uninit, - control, + do_control, start, grab_video_frame, get_video_framesize, diff --git a/stream/tvi_dummy.c b/stream/tvi_dummy.c index c0bf8bba32..24590fa428 100644 --- a/stream/tvi_dummy.c +++ b/stream/tvi_dummy.c @@ -67,7 +67,7 @@ static int uninit(priv_t *priv) return 1; } -static int control(priv_t *priv, int cmd, void *arg) +static int do_control(priv_t *priv, int cmd, void *arg) { switch(cmd) { diff --git a/stream/tvi_v4l2.c b/stream/tvi_v4l2.c index e9092ca4e7..135fcbf8ff 100644 --- a/stream/tvi_v4l2.c +++ b/stream/tvi_v4l2.c @@ -678,7 +678,7 @@ static void *vbi_grabber(void *data) return NULL; } -static int control(priv_t *priv, int cmd, void *arg) +static int do_control(priv_t *priv, int cmd, void *arg) { struct v4l2_control control; struct v4l2_frequency frequency; |