aboutsummaryrefslogtreecommitdiffstats
path: root/include/media
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2010-09-30 08:29:37 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-10-20 23:06:19 -0400
commit3fd8e647eaa76a1eb5bdd0fcecf49364a089b71d (patch)
tree262fec3628c13f004a49477fc19cc1ff20c12521 /include/media
parente3cfd447d01cf723ccda0ad6bfa2e85b73d3d747 (diff)
V4L/DVB: v4l2-common: Move v4l2_find_nearest_format from videodev2.h to v4l2-common.h
This function is an internal API and belongs in v4l2-common.h, not videodev.h. The return pointer and probe argument should be const as well. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/v4l2-common.h10
1 files changed, 10 insertions, 0 deletions
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index 98b32645e5a7..41dd480e45f1 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -232,4 +232,14 @@ void v4l_bound_align_image(unsigned int *w, unsigned int wmin,
232 unsigned int hmax, unsigned int halign, 232 unsigned int hmax, unsigned int halign,
233 unsigned int salign); 233 unsigned int salign);
234int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info); 234int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info);
235
236struct v4l2_discrete_probe {
237 const struct v4l2_frmsize_discrete *sizes;
238 int num_sizes;
239};
240
241const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
242 const struct v4l2_discrete_probe *probe,
243 s32 width, s32 height);
244
235#endif /* V4L2_COMMON_H_ */ 245#endif /* V4L2_COMMON_H_ */