diff options
| author | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 18:27:06 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2009-02-26 18:27:06 -0300 |
| commit | 7dab4777ac8eda4056484c99285d58b6b3a91235 (patch) | |
| tree | 09fd8bc608241a134916f07018d63cc567bee354 /linux/include | |
| parent | f46186826e1d7b2933456be22e325799587203db (diff) | |
| parent | ceb38ab7b287651e30d049e86e6469d4bcc3ea3b (diff) | |
| download | mediapointer-dvb-s2-7dab4777ac8eda4056484c99285d58b6b3a91235.tar.gz mediapointer-dvb-s2-7dab4777ac8eda4056484c99285d58b6b3a91235.tar.bz2 | |
merge: http://www.linuxtv.org/hg/~hverkuil/v4l-dvb-fill-std
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/media/v4l2-common.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/linux/include/media/v4l2-common.h b/linux/include/media/v4l2-common.h index 7779d9c93..3a6905615 100644 --- a/linux/include/media/v4l2-common.h +++ b/linux/include/media/v4l2-common.h @@ -102,7 +102,6 @@ int v4l2_ctrl_check(struct v4l2_ext_control *ctrl, struct v4l2_queryctrl *qctrl, const char *v4l2_ctrl_get_name(u32 id); const char **v4l2_ctrl_get_menu(u32 id); int v4l2_ctrl_query_fill(struct v4l2_queryctrl *qctrl, s32 min, s32 max, s32 step, s32 def); -int v4l2_ctrl_query_fill_std(struct v4l2_queryctrl *qctrl); int v4l2_ctrl_query_menu(struct v4l2_querymenu *qmenu, struct v4l2_queryctrl *qctrl, const char **menu_items); #define V4L2_CTRL_MENU_IDS_END (0xffffffff) |