diff options
| author | Jean-Francois Moine <moinejf@free.fr> | 2008-07-26 12:39:02 +0200 |
|---|---|---|
| committer | Jean-Francois Moine <moinejf@free.fr> | 2008-07-26 12:39:02 +0200 |
| commit | 72f5824b3f52fedf99d70a834d9be2a10ee318c6 (patch) | |
| tree | 6ff5926046a63813899eea2ae7fc20565d92b051 /v4l2-apps/util/v4l2-ctl.cpp | |
| parent | 350bbc5926746c35a38095da02fa7e82d67cca22 (diff) | |
| parent | ddb6d77848776ec7f6b3135f2dfa5fbc1544b003 (diff) | |
| download | mediapointer-dvb-s2-72f5824b3f52fedf99d70a834d9be2a10ee318c6.tar.gz mediapointer-dvb-s2-72f5824b3f52fedf99d70a834d9be2a10ee318c6.tar.bz2 | |
merge: v4l-dvb
Diffstat (limited to 'v4l2-apps/util/v4l2-ctl.cpp')
| -rw-r--r-- | v4l2-apps/util/v4l2-ctl.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index 57d98fc13..3e56e63a1 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -1019,9 +1019,9 @@ static int doioctl(int fd, int request, void *parm, const char *name) return retVal; } -static int parse_subopt(char **subs, char * const *subopts, char **value) +static int parse_subopt(char **subs, const char * const *subopts, char **value) { - int opt = getsubopt(subs, subopts, value); + int opt = getsubopt(subs, (char * const *)subopts, value); if (opt == -1) { fprintf(stderr, "Invalid suboptions specified\n"); @@ -1094,7 +1094,7 @@ static void parse_crop(char *optarg, unsigned int &set_crop, v4l2_rect &vcrop) char *subs = optarg; while (*subs != '\0') { - static char *const subopts[] = { + static const char *const subopts[] = { "left", "top", "width", @@ -1230,7 +1230,7 @@ int main(int argc, char **argv) case OptSetVideoFormat: subs = optarg; while (*subs != '\0') { - static char *const subopts[] = { + static const char *const subopts[] = { "width", "height", NULL @@ -1251,7 +1251,7 @@ int main(int argc, char **argv) case OptSetVideoOutFormat: subs = optarg; while (*subs != '\0') { - static char *const subopts[] = { + static const char *const subopts[] = { "width", "height", NULL @@ -1272,7 +1272,7 @@ int main(int argc, char **argv) case OptSetOutputOverlayFormat: subs = optarg; while (*subs != '\0') { - static char *const subopts[] = { + static const char *const subopts[] = { "chromakey", "global_alpha", NULL @@ -1293,7 +1293,7 @@ int main(int argc, char **argv) case OptSetFBuf: subs = optarg; while (*subs != '\0') { - static char *const subopts[] = { + static const char *const subopts[] = { "chromakey", "global_alpha", "local_alpha", @@ -1428,7 +1428,7 @@ int main(int argc, char **argv) fmt->fmt.sliced.service_set = 0; subs = optarg; while (*subs != '\0') { - static char *const subopts[] = { + static const char *const subopts[] = { "off", "teletext", "cc", |