This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l2-utils: Change get_(cap_compose|out_crop)_rect() return type to void Author: Xavier Roumegue <[email protected]> Date: Tue May 3 16:38:11 2022 +0200 Those functions always return 0, hence change their prototype to void. Signed-off-by: Xavier Roumegue <[email protected]> Signed-off-by: Hans Verkuil <[email protected]> utils/v4l2-ctl/v4l2-ctl-streaming.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=394eee7310155f75ed4b50ae25a7afb5ee8dbb40 diff --git a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp index 05de44d70e53..182afc506f56 100644 --- a/utils/v4l2-ctl/v4l2-ctl-streaming.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-streaming.cpp @@ -394,7 +394,7 @@ static enum codec_type get_codec_type(cv4l_fd &fd) return NOT_CODEC; } -static int get_cap_compose_rect(cv4l_fd &fd) +static void get_cap_compose_rect(cv4l_fd &fd) { cv4l_disable_trace dt(fd); v4l2_selection sel; @@ -407,14 +407,12 @@ static int get_cap_compose_rect(cv4l_fd &fd) support_cap_compose = true; composed_width = sel.r.width; composed_height = sel.r.height; - return 0; - } - - support_cap_compose = false; - return 0; + } else { + support_cap_compose = false; + } } -static int get_out_crop_rect(cv4l_fd &fd) +static void get_out_crop_rect(cv4l_fd &fd) { cv4l_disable_trace dt(fd); v4l2_selection sel; @@ -427,11 +425,9 @@ static int get_out_crop_rect(cv4l_fd &fd) support_out_crop = true; cropped_width = sel.r.width; cropped_height = sel.r.height; - return 0; + } else { + support_out_crop = false; } - - support_out_crop = false; - return 0; } static void set_time_stamp(cv4l_buffer &buf) _______________________________________________ linuxtv-commits mailing list [email protected] https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
