summaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-dev.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-06-21 13:23:27 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-06-26 15:58:57 -0300
commit7fa8e6fa1519194fc0c931f40d530fb55137bad9 (patch)
tree252e62177f7424c00d004a32388e6385147dab73 /include/media/v4l2-dev.h
parent7876ad75b1a3b7dc3d5d765d0be086d89fd2e663 (diff)
downloadlinux-7fa8e6fa1519194fc0c931f40d530fb55137bad9.tar.gz
linux-7fa8e6fa1519194fc0c931f40d530fb55137bad9.tar.bz2
linux-7fa8e6fa1519194fc0c931f40d530fb55137bad9.zip
V4L/DVB (8092): videodev: simplify and fix standard enumeration
VIDIOC_ENUMSTD did not return all the PAL/SECAM/NTSC variants: it just returned one single PAL/SECAM/NTSC standard without separate entries for the trickier standards like NTSC-JP. Changed the code so that it behaves better. Also simplified the if/switch statements into a common standards lookup table. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r--include/media/v4l2-dev.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index 33f01ae08f76..859f7a6f6f67 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -40,9 +40,9 @@
#define VFL_TYPE_VTX 3
/* Video standard functions */
-extern char *v4l2_norm_to_name(v4l2_std_id id);
+extern const char *v4l2_norm_to_name(v4l2_std_id id);
extern int v4l2_video_std_construct(struct v4l2_standard *vs,
- int id, char *name);
+ int id, const char *name);
/* Prints the ioctl in a human-readable format */
extern void v4l_printk_ioctl(unsigned int cmd);