diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-13 13:47:07 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-12-13 13:47:07 -0200 |
| commit | 2bf10f4704af48d1f3b0d403ef9dc13114a8afca (patch) | |
| tree | 643f7a6fb91db7a437b071b9217c1f0ea6bbfd06 /v4l2-apps | |
| parent | e5a282b9882a1c796aa5c92ddf787b78987397e1 (diff) | |
| parent | 1c4d36315614a51e0f369e13c21cb9ed30773bf2 (diff) | |
| download | mediapointer-dvb-s2-2bf10f4704af48d1f3b0d403ef9dc13114a8afca.tar.gz mediapointer-dvb-s2-2bf10f4704af48d1f3b0d403ef9dc13114a8afca.tar.bz2 | |
merge: http://linuxtv.org/hg/~hverkuil/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps')
| -rw-r--r-- | v4l2-apps/util/v4l2-ctl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index 7dabb3969..a0b14d9fb 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -242,7 +242,7 @@ static void usage(void) printf(" -s, --set-standard=<num>\n"); printf(" set the video standard to <num> [VIDIOC_S_STD]\n"); printf(" <num> can be a numerical v4l2_std value, or it can be one of:\n"); - printf(" pal-X (X = B/G/H/N/Nc/I/D/K/M) or just 'pal' (V4L2_STD_PAL)\n"); + printf(" pal-X (X = B/G/H/N/Nc/I/D/K/M/60) or just 'pal' (V4L2_STD_PAL)\n"); printf(" ntsc-X (X = M/J/K) or just 'ntsc' (V4L2_STD_NTSC)\n"); printf(" secam-X (X = B/G/H/D/K/L/Lc) or just 'secam' (V4L2_STD_SECAM)\n"); printf(" --list-standards display supported video standards [VIDIOC_ENUMSTD]\n"); @@ -778,6 +778,8 @@ static v4l2_std_id parse_pal(const char *pal) { if (pal[0] == '-') { switch (pal[1]) { + case '6': + return V4L2_STD_PAL_60; case 'b': case 'B': case 'g': |