diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2010-09-30 08:29:37 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2010-10-20 23:06:19 -0400 |
commit | 3fd8e647eaa76a1eb5bdd0fcecf49364a089b71d (patch) | |
tree | 262fec3628c13f004a49477fc19cc1ff20c12521 /drivers/media | |
parent | e3cfd447d01cf723ccda0ad6bfa2e85b73d3d747 (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 'drivers/media')
-rw-r--r-- | drivers/media/video/v4l2-common.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/media/video/v4l2-common.c b/drivers/media/video/v4l2-common.c index 31ae1a138613..cef80dab1a0d 100644 --- a/drivers/media/video/v4l2-common.c +++ b/drivers/media/video/v4l2-common.c | |||
@@ -677,12 +677,13 @@ int v4l_fill_dv_preset_info(u32 preset, struct v4l2_dv_enum_preset *info) | |||
677 | } | 677 | } |
678 | EXPORT_SYMBOL_GPL(v4l_fill_dv_preset_info); | 678 | EXPORT_SYMBOL_GPL(v4l_fill_dv_preset_info); |
679 | 679 | ||
680 | struct v4l2_frmsize_discrete *v4l2_find_nearest_format(struct v4l2_discrete_probe *probe, | 680 | const struct v4l2_frmsize_discrete *v4l2_find_nearest_format( |
681 | s32 width, s32 height) | 681 | const struct v4l2_discrete_probe *probe, |
682 | s32 width, s32 height) | ||
682 | { | 683 | { |
683 | int i; | 684 | int i; |
684 | u32 error, min_error = UINT_MAX; | 685 | u32 error, min_error = UINT_MAX; |
685 | struct v4l2_frmsize_discrete *size, *best = NULL; | 686 | const struct v4l2_frmsize_discrete *size, *best = NULL; |
686 | 687 | ||
687 | if (!probe) | 688 | if (!probe) |
688 | return best; | 689 | return best; |